Add new file

.gitattributes

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

.gitlab-ci.yml

@@ -1,28 +1,40 @@
-stages:          # List of stages for jobs, and their order of execution
+stages: 
+  - prepare         # List of stages for jobs, and their order of execution
   - release
 
+image: python:3.10
 
-release_job:  
+
+prepare_job:
+  stage: prepare
+  script:
+    - 'pip install requests'
+    - 'git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gl.beaconborn.ru/bacon/translation-generator.git'
+    - 'python3 translation-generator/main.py $CI_PROJECT_DIR/WPE-2/data/'
+    - 'ls -al'
+    - cat test.txt
+
+
+release_job: 
+  needs: 
+    - prepare_job
   stage: release  # It only runs when *both* jobs in the test stage complete successfully.
   image: registry.gitlab.com/gitlab-org/release-cli:latest
 
+
   only:
     # - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
     refs:
-      - main
+      - testing
       - ^tags
     changes:
-      - ^README.md
-      - ^CHANGELOG
-      - ^.gitattribute
-      - ^.gitignore
-      - ^.gitlab-ci.yml
       - data/**/*
       - modinfo.lua
       - thumb.png
+      - test.txt
 
   script:
-    - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA"
+    - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA branch $CI_COMMIT_BRANCH"
 
   release:
     tag_name: v2.0.$CI_PIPELINE_IID

data/localization/ru.po

@@ -1,140 +1,92 @@
-msgid ""
+# ========== /mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2023-08-29 21:02+0000\nPO-Revision-Date: 2023-08-29 21:28+0000\nLast-Translator: Weblate Admin <beaconborn@yandex.ru>\nLanguage-Team: Russian <http://weblate.beaconborn.ru/projects/wpe-2/ru/ru/>\nLanguage: ru\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\nX-Generator: Weblate 5.0\n"
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-
+msgctxt "Weapon Name"
-# ========== \data\scripts\lib\turretgenerator.lua ==========
+msgid "Smart Cannon"
-#: \data\scripts\lib\turretgenerator.lua:
-msgctxt "weapon name"
-msgid "SmartCannon"
 msgstr "Умная пушка"
 
-#: \data\scripts\lib\turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
+msgctxt "Weapon Prefix"
-msgid "Ionized SmartCannon"
+msgid "Smart Cannon"
-msgstr "Ионизирующая умная пушка"
+msgstr "Умная пушка"
 
-#: \data\scripts\lib\turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
+msgctxt "Weapon Name"
 msgid "Heavy Cannon"
-msgstr "Тяжелое орудие"
+msgstr "Тяжелая Пушка"
 
-#: \data\scripts\lib\turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
+msgctxt "Weapon Prefix"
 msgid "Cumulative Heavy Cannon"
-msgstr "Кумулятивное тяжелое орудие"
+msgstr "Кумулятивная тяжелая пушка"
 
-#: \data\scripts\lib\turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
-msgid "Diffuser"
-msgstr "Диффузор"
-
-#: \data\scripts\lib\turretgenerator.lua:
-msgctxt "weapon name"
-msgid "Hookgun"
-msgstr "Гарпун"
-
-#: \data\scripts\lib\turretgenerator.lua:
-msgctxt "weapon name"
-msgid "HiveLauncher"
-msgstr "Роевая ракетная установка"
-
-# ========== \data\scripts\lib\weapongenerator.lua ==========
-#: \data\scripts\lib\weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "SmartCannon"
-msgstr "Умная пушка"
-
-#: \data\scripts\lib\weapongenerator.lua:
 msgctxt "Weapon Prefix"
-msgid "SmartCannon"
-msgstr "Умная пушка"
-
-#: \data\scripts\lib\weapongenerator.lua:
-msgctxt "Weapon Name"
 msgid "Heavy Cannon"
-msgstr "Тяжелое орудие"
+msgstr "Тяжелая Пушка"
 
-#: \data\scripts\lib\weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
 msgid "Diffuser"
 msgstr "Диффузор"
 
-#: \data\scripts\lib\weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
 msgid "Diffuser"
 msgstr "Диффузор"
 
-#: \data\scripts\lib\weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "Hookgun"
-msgstr "Гарпун"
 
-#: \data\scripts\lib\weapongenerator.lua:
+# ========== /mods/WPE2/data/scripts/lib/weapontype.lua ==========
-msgctxt "Weapon Prefix"
+#: /mods/WPE2/data/scripts/lib/weapontype.lua:
-msgid "Hookgun"
+msgctxt "Weapon Type"
-msgstr "Гарпун"
+msgid "Auto Сannon"
+msgstr "Автопушка"
 
-#: \data\scripts\lib\weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Name"
+msgctxt "Weapon Type"
-msgid "HiveLauncher"
+msgid "Heavy Cannon"
-msgstr "Роевая ракетная установка"
+msgstr "Тяжелая Пушка"
 
-#: \data\scripts\lib\weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Prefix"
+msgctxt "Weapon Type"
-msgid "HiveLauncher"
+msgid "Diffuser"
-msgstr "Роевая ракетная установка"
+msgstr "Диффузор"
 
-# ========== \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua ==========
+
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+# ========== /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ==========
-msgctxt ""
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
 msgid "WPE Turrets"
-msgstr "WPE Турели"
+msgstr "Расширенный пак оружия"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Intro"
 msgstr "Вступление"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "In this part of the encyclopedia you will find a description of the turrets from the Weapon Pack Extended mod.\n\nI recommend using turret models from the collection in the workshop."
-msgstr "В этой части энциклопедии вы найдете описание турелей из мода Weapon Pack Extended.\n\nЯ рекомендую использовать модели турелей из коллекции в мастерской."
+msgstr "В этой части энциклопедии вы найдете описание турелей из мода Weapon Pack Extended. \n\nЯ рекомендую использовать модели турелей из коллекции в мастерской"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
+msgid "Autocannon"
-msgid "SmartCannon"
+msgstr "Автопушка"
-msgstr "Умная пушка"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "A lightweight version of the classic cannon.\n\nCompared to conventional cannons:\n+ Increased rate of fire (x2)\n+ Increased projectile speed (x1.5)\n+ A little more damage on the shield (10% - 15%)\n+ Can be equipped with homing missiles.\n- Less damage (x0.75)\n- Shorter damage range (x0.8)"
-msgstr "Облегченный вариант классической пушки.\n\nПо сравнению с обычными пушками:\n+ Увеличенная скорострельность (x2)\n+ Увеличенная скорость полета снаряда (x1,5)\n+ Немного больше урон по щиту (10% - 15%)\n+ Может быть оснащена самонаводящимися ракетами.\n- Меньший урон (x0,75)\n- Меньшая дальность поражения (x0,8)"
+msgstr "Облегченная версия классической пушки.\n\nПо сравнению с обычными пушками:\n+ Увеличенная скорострельность (x2)\n+ Увеличенная скорость полета снаряда (x1.5)\n+ Немного больший урон по щиту (10% - 15%)\n+ Может оснащаться самонаводящимися ракетами.\n- Меньший урон (x0.75)\n- Меньшая дальность поражения (x0.8)."
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Heavy Cannon"
-msgstr "Тяжелое орудие"
+msgstr "Тяжелая Пушка"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "The cannon of the main caliber. It shoots with heavy explosive shells, the hit of which can displace the enemy ship.\n\n+ High damage\n+ High projectile speed\n+ When hit, push the opponent\n+ Also can have a penetration\n- Low rate of fire\n- Occupies many slots\n- Big size\n- Requires more crew"
-msgstr "Пушка главного калибра. Стреляет тяжелыми разрывными снарядами, попадание которых может смести корабль противника.\n\n+ Высокий урон\n+ Высокая скорость полета снаряда\n+ При попадании толкает противника\n+ Также может иметь пробитие\n- Низкая скорострельность\n- Занимает много слотов\n- Большие размеры\n- Требуется больше экипажа"
+msgstr "Пушка главного калибра. Стреляет тяжелыми разрывными снарядами, попадание которых может смести вражеский корабль.\n\n+ Высокий урон\n+ Высокая скорость снаряда\n+ При попадании в цель толкает противника\n+ Также может иметь пробитие\n- Низкая скорострельность\n- Занимает много слотов\n- Большие размеры\n- Требует больше экипажа"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Energy diffuser"
 msgstr "Энегретический диффузор"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Short range combat weapon. Does not cause damage to the hull, but extremely effectively destroys shields. Requires civil slots.\n\nShield Damage x20"
 msgstr "Боевое оружие малой дальности. Не наносит повреждений корпусу, но чрезвычайно эффективно разрушает щиты. Требует гражданских слотов.\n\nУрон по щитам x20"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
-msgctxt ""
-msgid "Hookgun"
-msgstr "Гарпун"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
-msgctxt ""
-msgid "Short range combat weapon. Does not cause damage to the shield, but extremely effectively to attrac. Requires 2 gunners slots.\n May have penetration\n"
-msgstr "Боевое оружие малой дальности. Не наносит урона щиту, но чрезвычайно эффективно для атак. Требует 2 слота для стрелков.\nМожет иметь проникающую способность\n"

data/localization/template.pot

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

data/scripts/lib/galaxy.lua

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

data/scripts/lib/inventoryitemprice.lua

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

data/scripts/lib/turretgenerator.lua

@@ -1,352 +1,230 @@
-
+
-scales[WeaponType.SmartCannon] = {
+scales[WeaponType.SmartCannon] = {
-    {from = 0, to = 28, size = 1.0,     usedSlots = 2},
+    {from = 0, to = 28, size = 1.0,     usedSlots = 2},
-    {from = 29, to = 38, size = 1,5,    usedSlots = 3},
+    {from = 29, to = 38, size = 2.0,    usedSlots = 3},
-    {from = 39, to = 49, size = 2.0,    usedSlots = 4},
+    {from = 39, to = 49, size = 3.0,    usedSlots = 4},
-    --dummy for cooaxial, add 1 to size and level
+    --dummy for cooaxial, add 1 to size and level
-    {from = 50, to = 52, size = 4.0,    usedSlots = 5},
+    {from = 50, to = 52, size = 4.0,    usedSlots = 5},
-}
+}
-
+
-scales[WeaponType.HeavyCannon] = { -- TODO  уточнить размеры
+scales[WeaponType.HeavyCannon] = {
-    {from = 0, to = 28, size = 3.0,     usedSlots = 4},
+    {from = 0, to = 28, size = 3.0,     usedSlots = 4},
-    {from = 29, to = 38, size = 4.0,    usedSlots = 5},
+    {from = 29, to = 38, size = 4.0,    usedSlots = 5},
-    {from = 39, to = 49, size = 5.0,    usedSlots = 6},
+    {from = 39, to = 49, size = 5.0,    usedSlots = 6},
-    --dummy for cooaxial, add 1 to size and level
+    --dummy for cooaxial, add 1 to size and level
-    {from = 50, to = 52, size = 5,    usedSlots = 6},
+    {from = 50, to = 52, size = 5,    usedSlots = 6},
-}
+}
-
+
-scales[WeaponType.Diffuser] = {-- TODO проверить возможность спавна с определенной дистанции, Уточнить размеры
+scales[WeaponType.Diffuser] = {
-    {from = 0, to = 46, size = 1.0,     usedSlots = 2},
+    {from = 0, to = 46, size = 1.0,     usedSlots = 2},
-    {from = 47, to = 50, size = 2.0,    usedSlots = 4},
+    {from = 47, to = 50, size = 2.0,    usedSlots = 4},
-    --dummy for cooaxial, add 1 to size and level
+    --dummy for cooaxial, add 1 to size and level
-    {from = 51, to = 52, size = 3.0,    usedSlots = 6},
+    {from = 51, to = 52, size = 3.0,    usedSlots = 6},
-}
+}
-
+
-scales[WeaponType.Hookgun] = {
+scales[WeaponType.Hookgun] = {
-    {from = 0, to = 46, size = 1.0,     usedSlots = 2},
+    {from = 0, to = 46, size = 1.0,     usedSlots = 2},
-    {from = 47, to = 50, size = 2.0,    usedSlots = 4},
+    {from = 47, to = 50, size = 2.0,    usedSlots = 4},
-    --dummy for cooaxial, add 1 to size and level
+    --dummy for cooaxial, add 1 to size and level
-    {from = 51, to = 52, size = 4.0,    usedSlots = 6},
+    {from = 51, to = 52, size = 3.0,    usedSlots = 6},
-}
+}
-
+
-scales[WeaponType.HiveLauncher] = { -- TODO Увеличить разнообразие размеров6
+if GameVersion() >= Version(0, 31, 0) then
-    {from = 0, to = 46, size = 1.0,     usedSlots = 2},
+    possibleSpecialties[WeaponType.SmartCannon] = {
-    {from = 47, to = 50, size = 2.0,    usedSlots = 4},
+        {specialty = Specialty.HighDamage,      probability = 0.2},
-    --dummy for cooaxial, add 1 to size and level
+        {specialty = Specialty.HighFireRate,    probability = 0.3},
-    {from = 51, to = 52, size = 3.0,    usedSlots = 6},
+        {specialty = Specialty.HighRange,       probability = 0.7},
-}
+        -- {specialty = Specialty.HighHullDamage,  probability = 0.5},
-
+        -- {specialty = Specialty.LessCoolingTime,  probability = 0.4},
-if GameVersion() >= Version(0, 31, 0) then
+    }
-    possibleSpecialties[WeaponType.SmartCannon] = {
+else
-        {specialty = Specialty.HighDamage,      probability = 0.2},
+    possibleSpecialties[WeaponType.SmartCannon] = {
-        {specialty = Specialty.HighFireRate,    probability = 0.3},
+        Specialty.HighDamage,
-        {specialty = Specialty.HighRange,       probability = 0.7},
+        Specialty.HighFireRate,
-        -- {specialty = Specialty.HighHullDamage,  probability = 0.5},
+        Specialty.HighRange,
-        -- {specialty = Specialty.LessCoolingTime,  probability = 0.4},
+        Specialty.HighHullDamage,
-    }
+        Specialty.LessCoolingTime,
-else
+    }
-    possibleSpecialties[WeaponType.SmartCannon] = {
+end
-        Specialty.HighDamage,
+
-        Specialty.HighFireRate,
+if GameVersion() >= Version(0, 31, 0) then
-        Specialty.HighRange,
+    possibleSpecialties[WeaponType.HeavyCannon] = {
-        Specialty.HighHullDamage,
+        {specialty = Specialty.HighDamage,      probability = 0.2},
-        Specialty.LessCoolingTime,
+        {specialty = Specialty.HighRange,       probability = 0.35},
-    }
+        {specialty = Specialty.HighFireRate,    probability = 0.3},
-end
+        -- {specialty = Specialty.HighHullDamage,       probability = 0.2},
-
+        -- {specialty = Specialty.HighShieldDamage, probability = 0.2},
-if GameVersion() >= Version(0, 31, 0) then
+        -- {specialty = Specialty.LessCoolingTime, probability = 0.2}
-    possibleSpecialties[WeaponType.HeavyCannon] = {
+    }
-        {specialty = Specialty.HighDamage,      probability = 0.2},
+else
-        {specialty = Specialty.HighRange,       probability = 0.35},
+    possibleSpecialties[WeaponType.HeavyCannon] = {
-        {specialty = Specialty.HighFireRate,    probability = 0.3},
+        Specialty.HighDamage,
-        -- {specialty = Specialty.HighHullDamage,       probability = 0.2},
+        Specialty.HighFireRate,
-        -- {specialty = Specialty.HighShieldDamage, probability = 0.2},
+        Specialty.HighRange,
-        -- {specialty = Specialty.LessCoolingTime, probability = 0.2}
+        Specialty.HighHullDamage,
-    }
+        Specialty.HighShieldDamage,
-else
+        Specialty.LessCoolingTime,
-    possibleSpecialties[WeaponType.HeavyCannon] = {
+    }
-        Specialty.HighDamage,
+end
-        Specialty.HighFireRate,
+
-        Specialty.HighRange,
+if GameVersion() >= Version(0, 31, 0) then
-        Specialty.HighHullDamage,
+    possibleSpecialties[WeaponType.Diffuser] = {
-        Specialty.HighShieldDamage,
+        {specialty = Specialty.HighDamage,      probability = 0.3},
-        Specialty.LessCoolingTime,
+        {specialty = Specialty.HighRange,       probability = 0.3},
-    }
+        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
-end
+    }
-
+else
-if GameVersion() >= Version(0, 31, 0) then
+    possibleSpecialties[WeaponType.Diffuser] = {
-    possibleSpecialties[WeaponType.Diffuser] = {
+        Specialty.HighDamage,
-        {specialty = Specialty.HighDamage,      probability = 0.3},
+        Specialty.HighRange,
-        {specialty = Specialty.HighRange,       probability = 0.3},
+        Specialty.FasterRechargeTime,
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
+    }
-    }
+end
-else
+
-    possibleSpecialties[WeaponType.Diffuser] = {
+if GameVersion() >= Version(0, 31, 0) then
-        Specialty.HighDamage,
+    possibleSpecialties[WeaponType.Hookgun] = {
-        Specialty.HighRange,
+        {specialty = Specialty.HighDamage,      probability = 0.3},
-        Specialty.FasterRechargeTime,
+        {specialty = Specialty.HighRange,       probability = 0.3},
-    }
+        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
-end
+    }
-
+else
-if GameVersion() >= Version(0, 31, 0) then
+    possibleSpecialties[WeaponType.Hookgun] = {
-    possibleSpecialties[WeaponType.Hookgun] = {
+        Specialty.HighDamage,
-        {specialty = Specialty.HighDamage,      probability = 0.3},
+        Specialty.HighRange,
-        {specialty = Specialty.HighRange,       probability = 0.3},
+        Specialty.FasterRechargeTime,
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
+    }
-    }
+end
-else
+
-    possibleSpecialties[WeaponType.Hookgun] = {
+function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
-        Specialty.HighDamage,
+    local result = TurretTemplate()
-        Specialty.HighRange,
+
-        Specialty.FasterRechargeTime,
+    -- generate turret
-    }
+    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
-end
+    local crew = Crew()
-
+    crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
-if GameVersion() >= Version(0, 31, 0) then
+    result.crew = crew
-    possibleSpecialties[WeaponType.HiveLauncher] = {
+
-        {specialty = Specialty.HighDamage,      probability = 0.3},
+    -- generate weapons
-        {specialty = Specialty.HighRange,       probability = 0.3},
+    local numWeapons = rand:getInt(1, 4)
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
+
-    }
+    local weapon = WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
-else
+    weapon.fireDelay = weapon.fireDelay * numWeapons
-    possibleSpecialties[WeaponType.HiveLauncher] = {
+
-        Specialty.HighDamage,
+    -- attach weapons to turret
-        Specialty.HighRange,
+    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
-        Specialty.FasterRechargeTime,
+
-    }
+    local shootingTime = 25 * rand:getFloat(0.8, 1.2)
-end
+    local coolingTime = 15 * rand:getFloat(0.8, 1.2)
-
+    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
-function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
+
-    local result = TurretTemplate()
+    TurretGenerator.scale(rand, result, WeaponType.SmartCannon, tech, 0.6)
-
+    TurretGenerator.addSpecialties(rand, result, WeaponType.SmartCannon)
-    -- generate turret
+
-    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
+    result:updateStaticStats()
-    local crew = Crew()
+
-    crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
+    return result
-    result.crew = crew
+end
-
+
-    -- generate weapons
+generatorFunction[WeaponType.SmartCannon] = TurretGenerator.generateSmartCannonTurret
-    local numWeapons = rand:getInt(1, 4)
+
-
+
-    local weapon = WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
+function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, rarity)
-    weapon.fireDelay = weapon.fireDelay * numWeapons
+    local result = TurretTemplate()
-
+
-    -- attach weapons to turret
+    -- generate turret
-    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
+    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
-
+    local crew = Crew()
-    local shootingTime = 25 * rand:getFloat(0.8, 1.2)
+    crew:add(requiredCrew*2, CrewMan(CrewProfessionType.Gunner))
-    local coolingTime = 15 * rand:getFloat(0.8, 1.2)
+    crew:add(requiredCrew, CrewMan(CrewProfessionType.Repair))
-    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
+    result.crew = crew
-
+
-    TurretGenerator.scale(rand, result, WeaponType.SmartCannon, tech, 0.6)
+    -- generate weapons
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.SmartCannon)
+    local numWeapons = rand:getInt(1, 4)
-
+
-    result.slotType = TurretSlotType.Armed
+    local weapon = WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
-    result:updateStaticStats()
+    weapon.fireDelay = weapon.fireDelay * numWeapons
-
+
-    local name = "SmartCannon /* weapon name*/"%_T
+    -- attach weapons to turret
-    
+    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
-    local specType = 1
+
-    if specType > 0 then 
+    local shootingTime = 25 * rand:getFloat(0.8, 1.2)
-        name = "Ionized SmartCannon /* weapon name*/"%_T
+    local coolingTime = 20 * rand:getFloat(0.8, 1.2)
-        weapon.shieldPenetration = 1
+    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
-    end
+
-
+    TurretGenerator.scale(rand, result, WeaponType.HeavyCannon, tech, 0.6)
-    local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
+    TurretGenerator.addSpecialties(rand, result, WeaponType.HeavyCannon)
-
+
-    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:updateStaticStats()
-
+
-    return result
+    return result
-end
+end
-
+
-generatorFunction[WeaponType.SmartCannon] = TurretGenerator.generateSmartCannonTurret
+generatorFunction[WeaponType.HeavyCannon] = TurretGenerator.generateHeavyCannonTurret
-
+
-
+
-function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, rarity)
+function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarity)
-    local result = TurretTemplate()
+    local result = TurretTemplate()
-
+
-    -- generate turret
+    -- generate turret
-    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
+    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
-    local crew = Crew()
+    local crew = Crew()
-    crew:add(requiredCrew*2, CrewMan(CrewProfessionType.Gunner))
+    crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
-    crew:add(requiredCrew, CrewMan(CrewProfessionType.Repair))
+    result.crew = crew
-    result.crew = crew
+
-
+    -- generate weapons
-    -- generate weapons
+    local numWeapons = rand:getInt(1, 2)
-    local numWeapons = rand:getInt(1, 4)
+
-
+    local weapon = WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
-    local weapon = WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
+    weapon.damage = weapon.damage / numWeapons
-    weapon.fireDelay = weapon.fireDelay * numWeapons
+
-
+    -- attach weapons to turret
-    -- attach weapons to turret
+    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
-    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
+
-
+    local rechargeTime = 20 * rand:getFloat(0.8, 1.2)
-    local shootingTime = 25 * rand:getFloat(0.8, 1.2)
+    local shootingTime = 15 * rand:getFloat(0.8, 1.2)
-    local coolingTime = 20 * rand:getFloat(0.8, 1.2)
+    TurretGenerator.createBatteryChargeCooling(result, rechargeTime, shootingTime)
-    TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
+
-
+
-    TurretGenerator.scale(rand, result, WeaponType.HeavyCannon, tech, 0.6)
+    TurretGenerator.scale(rand, result, WeaponType.Diffuser, tech, 0.75)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.HeavyCannon)
+    TurretGenerator.addSpecialties(rand, result, WeaponType.Diffuser)
-
+
-    result.slotType = TurretSlotType.Armed
+    result:updateStaticStats()
-    result:updateStaticStats()
+
-
+    return result
-    local name = "Heavy Cannon /* weapon name*/"%_T
+end
-
+
-    local Pen = rand:getInt(0, rarity.value)
+generatorFunction[WeaponType.Diffuser] = TurretGenerator.generateDiffuserTurret
-    if Pen > 0 then 
+
-        weapon.blockPenetration = Pen
+
-        name = "Cumulative Heavy Cannon /* weapon name*/"%_T
+function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity)
-    end
+    local result = TurretTemplate()
-
+
-    local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
+    -- generate turret
-    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)
+    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
-
+    local crew = Crew()
-    return result
+    crew:add(requiredCrew*2, CrewMan(CrewProfessionType.Gunner))
-end
+    result.crew = crew
-
+
-generatorFunction[WeaponType.HeavyCannon] = TurretGenerator.generateHeavyCannonTurret
+    -- generate weapons
-
+    local numWeapons = rand:getInt(1, 2)
-
+
-function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarity)
+    local weapon = WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
-    local result = TurretTemplate()
+    weapon.damage = weapon.damage / numWeapons
-
+
-    -- generate turret
+    -- attach weapons to turret
-    local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
+    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
-    local crew = Crew()
+
-    crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
+    local rechargeTime = 4 * rand:getFloat(0.8, 1.2)
-    result.crew = crew
+    local shootingTime = 2 * rand:getFloat(0.8, 1.2)
-
+    TurretGenerator.createBatteryChargeCooling(result, rechargeTime, shootingTime)
-    -- generate weapons
+
-    local numWeapons = rand:getInt(1, 2)
+
-
+    TurretGenerator.scale(rand, result, WeaponType.Hookgun, tech, 0.75)
-    local weapon = WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
+    TurretGenerator.addSpecialties(rand, result, WeaponType.Hookgun)
-    weapon.damage = weapon.damage / numWeapons
+
-
+    result:updateStaticStats()
-    -- attach weapons to turret
+
-    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
+    return result
-
+end
-    local rechargeTime = 20 * rand:getFloat(0.8, 1.2)
+
-    local shootingTime = 15 * rand:getFloat(0.8, 1.2)
+generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret
-    TurretGenerator.createBatteryChargeCooling(result, rechargeTime, shootingTime)
-
-
-    TurretGenerator.scale(rand, result, WeaponType.Diffuser, tech, 0.75)
-    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], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_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()
-
-    -- 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.generateHookgun(rand, dps, tech, material, rarity)
-    weapon.damage = weapon.damage / numWeapons
-
-    -- attach weapons to turret
-    TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
-
-    local rechargeTime = 4 * rand:getFloat(0.8, 1.2)
-    local shootingTime = 2 * rand:getFloat(0.8, 1.2)
-    TurretGenerator.createBatteryChargeCooling(result, rechargeTime, shootingTime)
-
-
-    TurretGenerator.scale(rand, result, WeaponType.Hookgun, tech, 0.75)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.Hookgun)
-
-    result.slotType = TurretSlotType.Armed
-    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)
-
-    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 = "HiveLauncher /* 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)
-
-    return result
-end
-
-generatorFunction[WeaponType.HiveLauncher] = TurretGenerator.generateHiveLauncherTurret

data/scripts/lib/turretingredients.lua

@@ -1,56 +1,45 @@
-
+
-TurretIngredients[WeaponType.SmartCannon] =
+TurretIngredients[WeaponType.SmartCannon] =
-{
+{
-    {name = "Servo",                amount = 15,   investable = 10, minimum = 5,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Servo",                amount = 15,   investable = 10, minimum = 5,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
-    {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
+    {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
-    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
+    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
-    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage", investFactor = 0.5,},
+    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage", investFactor = 0.5,},
-    {name = "Targeting Card",       amount = 3,    investable = 3,  minimum = 0,     weaponStat = "seeker", investFactor = 1, changeType = StatChanges.Flat},
+    {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",                amount = 8,    investable = 10, minimum = 3,},
-    {name = "Steel Tube",           amount = 5,    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},
+    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
-}
+}
-
+
-TurretIngredients[WeaponType.HeavyCannon] =
+TurretIngredients[WeaponType.SmartCannon] =
-{
+{
-    {name = "Servo",                amount = 8,   investable = 8, minimum = 4,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Servo",                amount = 8,   investable = 8, minimum = 4,  weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
-    {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
+    {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
-    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
+    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
-    {name = "Ammunition",           amount = 5,    investable = 10,  minimum = 3,    weaponStat = "damage", investFactor = 0.2,},
+    {name = "Ammunition",           amount = 5,    investable = 10,  minimum = 3,    weaponStat = "damage", investFactor = 0.2,},
-    {name = "Steel",                amount = 20,   investable = 10, minimum = 20,},
+    {name = "Steel",                amount = 20,   investable = 10, minimum = 20,},
-    {name = "Metal Plate",          amount = 8,    investable = 10, minimum = 10,},
+    {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},
+    -- {name = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
-}
+}
-
+
-TurretIngredients[WeaponType.Diffuser] =
+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 = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
-    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
+    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
-    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
+    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
-    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
+    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
-    {name = "Silver",               amount = 5,   investable = 0, minimum = 5,},
+    {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 = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
-}
+}
-
+
-TurretIngredients[WeaponType.Hookgun] =
+TurretIngredients[WeaponType.Hookgun] =
-{
+{
-    {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 = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
-    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
+    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
-    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
+    {name = "Steel",                amount = 20,   investable = 0, minimum = 20,},
-    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
+    {name = "Copper",               amount = 10,   investable = 0, minimum = 10,},
-    {name = "Silver",               amount = 5,   investable = 0, minimum = 5,},
+    {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 = "Targeting System",     amount = 0,    investable = 2,  minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat},
-}
+}
-
-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},
-}

data/scripts/lib/weapongenerator.lua

@@ -1,247 +1,201 @@
-
+
-function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
+function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
-    local weapon = Weapon()
+    local weapon = Weapon()
-    weapon:setProjectile()
+    weapon:setProjectile()
-
+
-    dps = dps * 0.75
+    dps = dps * 0.75
-    local fireDelay = rand:getFloat(1.5, 2.5)*0.5
+    local fireDelay = rand:getFloat(1.5, 2.5)*0.5
-    local reach = rand:getFloat(1100, 1500)*0.7
+    local reach = rand:getFloat(1100, 1500)*0.7
-    local damage = dps * fireDelay
+    local damage = dps * fireDelay
-    local speed = rand:getFloat(300, 400)*2
+    local speed = rand:getFloat(300, 400)*2
-    local existingTime = (reach / speed)*1.2
+    local existingTime = (reach / speed)*1.2
-
+
-    weapon.fireDelay = fireDelay
+    weapon.fireDelay = fireDelay
-    weapon.reach = reach
+    weapon.reach = reach
-    weapon.appearanceSeed = rand:getInt()
+    weapon.appearanceSeed = rand:getInt()
-    weapon.seeker = 1
+    weapon.seeker = rand:test(1 / 2)
-    weapon.appearance = WeaponAppearance.Cannon
+    weapon.appearance = WeaponAppearance.Cannon
-    weapon.name = "SmartCannon /* Weapon Name*/"%_t
+    weapon.name = "Smart Cannon /* Weapon Name*/"%_t
-    weapon.prefix = "SmartCannon /* Weapon Prefix*/"%_t
+    weapon.prefix = "Smart Cannon /* Weapon Prefix*/"%_t
-    weapon.icon = "data/textures/icons/smartcannon.png" 
+    weapon.icon = "data/textures/icons/autocannon.png" 
-    weapon.sound = "cannon"
+    weapon.sound = "cannon"
-    weapon.accuracy = 0.99 - rand:getFloat(0, 0.03)
+    weapon.accuracy = 0.99 - rand:getFloat(0, 0.03)
-
+
-    weapon.damage = damage
+    weapon.damage = damage
-    weapon.damageType = DamageType.Physical
+    weapon.damageType = DamageType.Physical
-    weapon.impactParticles = ImpactParticles.Explosion
+    weapon.impactParticles = ImpactParticles.Explosion
-    weapon.shieldDamageMultiplicator=1.1 + rarity.value * 0.1
+    weapon.shieldDamageMultiplicator=1.1 + rarity.value * 0.1
-    weapon.impactSound = 1
+    weapon.impactSound = 1
-    weapon.impactExplosion = true
+    weapon.impactExplosion = true
-
+
-
+    weapon.psize = rand:getFloat(0.2, 0.5)
-    weapon.psize = rand:getFloat(0.2, 0.5)
+    weapon.pmaximumTime = existingTime
-    weapon.pmaximumTime = existingTime
+    weapon.pvelocity = speed
-    weapon.pvelocity = speed
+    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
-    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
+
-
+    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
-    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
+
-
+    -- these have to be assigned after the weapon was adjusted since the damage might be changed
-    -- these have to be assigned after the weapon was adjusted since the damage might be changed
+    weapon.recoil = weapon.damage * 20 * 0.75
-    weapon.recoil = weapon.damage * 20 * 0.75
+    weapon.explosionRadius = math.sqrt(weapon.damage * 6)
-    weapon.explosionRadius = math.sqrt(weapon.damage * 6)
+
-
+    return weapon
-    return weapon
+end
-end
+
-
+generatorFunction[WeaponType.SmartCannon] = WeaponGenerator.generateSmartCannon
-generatorFunction[WeaponType.SmartCannon] = WeaponGenerator.generateSmartCannon
+
-
+function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
-
+    local weapon = Weapon()
-
+    weapon:setProjectile()
-function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
+
-    local weapon = Weapon()
+    dps = dps * 1.85
-    weapon:setProjectile()
+    local fireDelay = rand:getFloat(1.5, 2.0)*1.7
-
+    local reach = rand:getFloat(1100, 1500)*1.2
-    dps = dps * 1.85
+    local damage = dps * fireDelay
-    local fireDelay = rand:getFloat(1.5, 2.0)*1.7
+    local speed = rand:getFloat(600, 1000)*1.4
-    local reach = rand:getFloat(1100, 1500)*1.2
+    local existingTime = (reach / speed)*1.1
-    local damage = dps * fireDelay
+
-    local speed = rand:getFloat(600, 1000)*1.4
+    weapon.fireDelay = fireDelay
-    local existingTime = (reach / speed)*1.1
+    weapon.reach = reach
-
+    weapon.appearanceSeed = rand:getInt()
-    weapon.fireDelay = fireDelay
+    weapon.appearance = WeaponAppearance.Bolter
-    weapon.reach = reach
+    weapon.name = "Heavy Cannon /* Weapon Name*/"%_t
-    weapon.appearanceSeed = rand:getInt()
+    weapon.icon = "data/textures/icons/heavycannon.png"
-    weapon.appearance = WeaponAppearance.Bolter
+    weapon.sound = "cannon"
-    weapon.name = "Heavy Cannon /* Weapon Name*/"%_t
+    weapon.accuracy = 0.95 - rand:getFloat(0, 0.02)
-    weapon.icon = "data/textures/icons/heavycannon.png"
+
-    weapon.sound = "cannon"
+    weapon.damage = damage
-    weapon.accuracy = 0.95 - rand:getFloat(0, 0.02)
+    weapon.damageType = DamageType.Physical
-
+    weapon.impactParticles = ImpactParticles.Explosion
-    weapon.damage = damage
+    weapon.impactSound = 1
-    weapon.damageType = DamageType.Physical
+    weapon.impactExplosion = true
-    weapon.impactParticles = ImpactParticles.Explosion
+    weapon.otherForce = dps*math.max(1, rarity.value)*89*5
-    weapon.impactSound = 1
+
-    weapon.impactExplosion = true
+
-    weapon.otherForce = dps*math.max(1, rarity.value)*89*5
+    weapon.psize = rand:getFloat(0.2, 0.5)
-
+    weapon.pmaximumTime = existingTime
-
+    weapon.pvelocity = speed
-    weapon.psize = rand:getFloat(0.2, 0.5)
+    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
-    weapon.pmaximumTime = existingTime
+
-    weapon.pvelocity = speed
+    local Pen = rand:getInt(0, rarity.value)
-    weapon.pcolor = ColorHSV(rand:getFloat(10, 60), 0.7, 1)
+    if Pen > 0 then 
-
+        weapon.blockPenetration = Pen
-    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
+        weapon.prefix = "Cumulative Heavy Cannon /* Weapon Prefix*/"%_t
-
+    else
-    -- these have to be assigned after the weapon was adjusted since the damage might be changed
+        weapon.prefix = "Heavy Cannon /* Weapon Prefix*/"%_t
-    weapon.recoil = weapon.damage * 50
+    end
-    weapon.explosionRadius = math.sqrt(weapon.damage * 7)
+
-
+    
-    return weapon
+    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
-end
+
-
+    -- these have to be assigned after the weapon was adjusted since the damage might be changed
-generatorFunction[WeaponType.HeavyCannon] = WeaponGenerator.generateHeavyCannon
+    weapon.recoil = weapon.damage * 50
-
+    weapon.explosionRadius = math.sqrt(weapon.damage * 7)
-
+
-
+    return weapon
-function WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
+end
-    local weapon = Weapon()
+
-    weapon:setBeam()
+generatorFunction[WeaponType.HeavyCannon] = WeaponGenerator.generateHeavyCannon
-
+
-    local fireDelay = rand:getFloat(1, 2.5)*0.5
+
-    local reach = rand:getFloat(950, 1400)
+function WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
-    local damage = dps * fireDelay
+    local weapon = Weapon()
-
+    weapon:setBeam()
-    weapon.fireDelay = fireDelay
+
-    weapon.appearanceSeed = rand:getInt()
+    local fireDelay = rand:getFloat(1, 2.5)*0.5
-    weapon.reach = reach
+    local reach = rand:getFloat(950, 1400)
-    weapon.continuousBeam = false
+    local damage = dps * fireDelay
-    weapon.appearance = WeaponAppearance.Tesla
+
-    weapon.name = "Diffuser /* Weapon Name*/"%_t
+    weapon.fireDelay = fireDelay
-    weapon.prefix = "Diffuser /* Weapon Prefix*/"%_t
+    weapon.appearanceSeed = rand:getInt()
-    weapon.icon = "data/textures/icons/diffuser.png" 
+    weapon.reach = reach
-    weapon.sound = "railgun"
+    weapon.continuousBeam = false
-    weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
+    weapon.appearance = WeaponAppearance.Tesla
-
+    weapon.name = "Diffuser /* Weapon Name*/"%_t
-    weapon.damage = damage
+    weapon.prefix = "Diffuser /* Weapon Prefix*/"%_t
-    weapon.damageType = DamageType.Energy
+    weapon.icon = "data/textures/icons/diffuser.png" 
-    weapon.impactParticles = ImpactParticles.Energy
+    weapon.sound = "railgun"
-    weapon.shieldDamageMultiplicator = 20 + rand:getFloat(0, 4) + rarity.value * 3
+    weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
-    weapon.stoneDamageMultiplicator = 0
+
-    weapon.hullDamageMultiplicator = 0
+    weapon.damage = damage
-    weapon.impactSound = 1
+    weapon.damageType = DamageType.Energy
-
+    weapon.impactParticles = ImpactParticles.Energy
-    weapon.blength = weapon.reach
+    weapon.shieldDamageMultiplicator = 20 + rand:getFloat(0, 4) + rarity.value * 3
-    weapon.bshape = BeamShape.Lightning
+    weapon.stoneDamageMultiplicator = 0
-    weapon.bwidth = 0.5
+    weapon.hullDamageMultiplicator = 0
-    weapon.bauraWidth = 3
+    weapon.impactSound = 1
-    weapon.banimationSpeed = 0
+
-    weapon.banimationAcceleration = 0
+    weapon.blength = weapon.reach
-    weapon.bshapeSize = 13
+    weapon.bshape = BeamShape.Lightning
-
+    weapon.bwidth = 0.5
-    -- shades of blue
+    weapon.bauraWidth = 3
-    weapon.bouterColor = ColorHSV(rand:getFloat(180, 260), rand:getFloat(0.5, 1), rand:getFloat(0.1, 0.5))
+    weapon.banimationSpeed = 0
-    weapon.binnerColor = ColorHSV(rand:getFloat(180, 260), rand:getFloat(0.1, 0.5), 1)
+    weapon.banimationAcceleration = 0
-
+    weapon.bshapeSize = 13
-    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
+
-
+    -- shades of blue
-    weapon.recoil = weapon.damage * 5
+    weapon.bouterColor = ColorHSV(rand:getFloat(180, 260), rand:getFloat(0.5, 1), rand:getFloat(0.1, 0.5))
-
+    weapon.binnerColor = ColorHSV(rand:getFloat(180, 260), rand:getFloat(0.1, 0.5), 1)
-    return weapon
+
-end
+    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
-
+
-generatorFunction[WeaponType.Diffuser] = WeaponGenerator.generateDiffuser
+    weapon.recoil = weapon.damage * 5
-
+
-
+    return weapon
-
+end
-function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
+
-    local weapon = Weapon()
+generatorFunction[WeaponType.Diffuser] = WeaponGenerator.generateDiffuser
-    weapon:setBeam()
+
-
+
-    local fireDelay = rand:getFloat(0.2, 0.5)
+
-    local reach = rand:getFloat(500, 900)
+function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
-    local damage = dps * fireDelay
+    local weapon = Weapon()
-
+    weapon:setBeam()
-    weapon.fireDelay = fireDelay
+
-    weapon.appearanceSeed = rand:getInt()
+    local fireDelay = rand:getFloat(0.2, 0.5)
-    weapon.reach = reach
+    local reach = rand:getFloat(500, 900)
-    weapon.continuousBeam = true
+    local damage = dps * fireDelay
-    weapon.appearance = WeaponAppearance.Cannon
+
-    weapon.name = "Hookgun /* Weapon Name*/"%_t
+    weapon.fireDelay = fireDelay
-    weapon.prefix = "Hookgun /* Weapon Prefix*/"%_t
+    weapon.appearanceSeed = rand:getInt()
-    weapon.icon = "data/textures/icons/hookgun.png" 
+    weapon.reach = reach
-    weapon.sound = "cannon"
+    weapon.continuousBeam = true
-    weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
+    weapon.appearance = WeaponAppearance.Cannon
-
+    weapon.name = "Hookgun /* Weapon Name*/"%_t
-    weapon.blockPenetration = rand:getInt(0, rarity.value) + 2
+    weapon.prefix = "Hookgun /* Weapon Prefix*/"%_t
-
+    weapon.icon = "data/textures/icons/harpoon.png" 
-
+    weapon.sound = "cannon"
-    weapon.otherForce = -500 * dps * rarity.value
+    weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
-
+
-    weapon.damage = damage
+    weapon.blockPenetration = rand:getInt(0, rarity.value) + 2
-    weapon.damageType = DamageType.Physical
+
-    weapon.impactParticles = ImpactParticles.Physical
+
-    weapon.shieldDamageMultiplicator = 0.75
+    weapon.otherForce = -500 * dps * rarity.value
-    weapon.stoneDamageMultiplicator = 1.2
+
-    weapon.hullDamageMultiplicator = 1
+    weapon.damage = damage
-    weapon.impactSound = 1
+    weapon.damageType = DamageType.Physical
-
+    weapon.impactParticles = ImpactParticles.Physical
-    weapon.blength = weapon.reach
+    weapon.shieldDamageMultiplicator = 0.75
-    weapon.bshape = BeamShape.Swirly
+    weapon.stoneDamageMultiplicator = 1.2
-    weapon.bwidth = 0.5
+    weapon.hullDamageMultiplicator = 1
-    weapon.bauraWidth = 3
+    weapon.impactSound = 1
-    weapon.banimationSpeed = 0
+
-    weapon.banimationAcceleration = 0
+    weapon.blength = weapon.reach
-    weapon.bshapeSize = 13
+    weapon.bshape = BeamShape.Swirly
-
+    weapon.bwidth = 0.5
-    -- shades of blue
+    weapon.bauraWidth = 3
-    weapon.bouterColor = ColorHSV(0, 0, rand:getFloat(0.35, 0.65))
+    weapon.banimationSpeed = 0
-    weapon.binnerColor = ColorHSV(1, 1, rand:getFloat(0.35, 0.65))
+    weapon.banimationAcceleration = 0
-
+    weapon.bshapeSize = 13
-    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
+
-
+    -- shades of blue
-
+    weapon.bouterColor = ColorHSV(0, 0, rand:getFloat(0.35, 0.65))
-    return weapon
+    weapon.binnerColor = ColorHSV(1, 1, rand:getFloat(0.35, 0.65))
-end
+
-
+    WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
-generatorFunction[WeaponType.Hookgun] = WeaponGenerator.generateHookgun
+
-
+
-
+    return weapon
-
+end
-function WeaponGenerator.generateHiveLauncher(rand, dps, tech, material, rarity)
+
-    local weapon = Weapon()
+generatorFunction[WeaponType.Hookgun] = WeaponGenerator.generateHookgun
-    weapon:setProjectile()
-
-    local fireDelay = rand:getFloat(2.2, 3)
-    local reach = rand:getFloat(1300, 1800)
-    local damage = dps * fireDelay
-    local speed = rand:getFloat(150, 200)
-    local existingTime = reach / speed
-
-    weapon.fireDelay = fireDelay 
-    weapon.reach = reach
-    weapon.appearanceSeed = rand:getInt()
-    weapon.seeker = true
-    weapon.appearance = WeaponAppearance.RocketLauncher
-    weapon.name = "HiveLauncher /* Weapon Name*/"%_t
-    weapon.prefix = "HiveLauncher /* 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.7, 1)
-    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

data/scripts/lib/weapontype.lua

@@ -1,6 +1,5 @@
-
+
-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("HeavyCannon", "Heavy Cannon /* Weapon Type */"%_t, armed)
-WeaponTypes.addType("Diffuser", "Diffuser /* Weapon Type */"%_t, armed)
+WeaponTypes.addType("Diffuser", "Diffuser /* Weapon Type */"%_t, armed)
-WeaponTypes.addType("Hookgun", "Hookgun /* Weapon Type */"%_t, armed)
+WeaponTypes.addType("Hookgun", "Hookgun /* Weapon Type */"%_t, armed)
-WeaponTypes.addType("HiveLauncher", "HiveLauncher /* Weapon Type */"%_t, armed)

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

@@ -14,7 +14,7 @@ category.chapters =
     },
 
     {   
-        title = "Smartcannon"%_t,
+        title = "Autocannon"%_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,
     },

modinfo.lua

@@ -10,13 +10,13 @@ meta =
     name = "Weapon_Pack_Extended2",
 
     -- Title of your mod that will be displayed to players
-    title = "Weapon Pack Extended - Reloaded",
+    title = "Weapon Pack Extended2",
 
     -- 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 = {"Casimir Kepler, Baconborn, OmenOs"},
+    authors = {"Alive!"},
 
     -- 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
@@ -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/", "https://steamcommunity.com/id/baconborn/",
+    contact = "https://steamcommunity.com/id/CasKepler2/",
 }

test.txt

@@ -0,0 +1 @@
+