Update .gitlab-ci.yml 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,22 +1,33 @@
-stages:          # List of stages for jobs, and their order of execution
+stages: 
+  - prepare         # List of stages for jobs, and their order of execution
   - release
 
 
+
+
+prepare_job:
+  stage: prepare
+  image: python:3.10
+  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'
+
+
 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

data/localization/ru.po

@@ -1,138 +1,92 @@
-# ========== \data\scripts\lib\turretgenerator.lua ==========
+# ========== /mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
-#: \data\scripts\lib\turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
+msgctxt "Weapon Name"
 msgid "Smart Cannon"
-msgstr ""
+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 ""
+msgstr "Диффузор"
 
-#: \data\scripts\lib\weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
 msgid "Diffuser"
-msgstr ""
+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 ""
+msgstr "Расширенный пак оружия"
 
-#: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgctxt ""
 msgid "Intro"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
 

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.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.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,13 +1,13 @@
 
 scales[WeaponType.SmartCannon] = {
     {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
     {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 = 29, to = 38, size = 4.0,    usedSlots = 5},
     {from = 39, to = 49, size = 5.0,    usedSlots = 6},
@@ -15,7 +15,7 @@ scales[WeaponType.HeavyCannon] = { -- TODO  уточнить размеры
     {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 = 47, to = 50, size = 2.0,    usedSlots = 4},
     --dummy for cooaxial, add 1 to size and level
@@ -23,13 +23,6 @@ scales[WeaponType.Diffuser] = {-- TODO проверить возможность
 }
 
 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] = { -- TODO Увеличить разнообразие размеров6
     {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
@@ -102,20 +95,6 @@ else
     }
 end
 
-if GameVersion() >= Version(0, 31, 0) then
-    possibleSpecialties[WeaponType.HiveLauncher] = {
-        {specialty = Specialty.HighDamage,      probability = 0.3},
-        {specialty = Specialty.HighRange,       probability = 0.3},
-        -- {specialty = Specialty.FasterRechargeTime,    probability = 0.6},
-    }
-else
-    possibleSpecialties[WeaponType.HiveLauncher] = {
-        Specialty.HighDamage,
-        Specialty.HighRange,
-        Specialty.FasterRechargeTime,
-    }
-end
-
 function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -139,23 +118,10 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
 
     TurretGenerator.scale(rand, result, WeaponType.SmartCannon, tech, 0.6)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.SmartCannon)
+    TurretGenerator.addSpecialties(rand, result, WeaponType.SmartCannon)
 
-    result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
-    local name = "SmartCannon /* weapon name*/"%_T
-    
-    local specType = 1
-    if specType > 0 then 
-        name = "Ionized SmartCannon /* weapon name*/"%_T
-        weapon.shieldPenetration = 1
-    end
-
-    local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
-
-    result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial], e.g. Enduring Dual Coaxial Plasmatic Tri-R-Mining Laser T-F */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
-
     return result
 end
 
@@ -186,22 +152,10 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     TurretGenerator.createStandardCooling(result, coolingTime, shootingTime)
 
     TurretGenerator.scale(rand, result, WeaponType.HeavyCannon, tech, 0.6)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.HeavyCannon)
+    TurretGenerator.addSpecialties(rand, result, WeaponType.HeavyCannon)
 
-    result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
-    local name = "Heavy Cannon /* weapon name*/"%_T
-
-    local Pen = rand:getInt(0, rarity.value)
-    if Pen > 0 then 
-        weapon.blockPenetration = Pen
-        name = "Cumulative Heavy Cannon /* weapon name*/"%_T
-    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
 
@@ -232,16 +186,10 @@ function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarit
 
 
     TurretGenerator.scale(rand, result, WeaponType.Diffuser, tech, 0.75)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.Diffuser)
+    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
 
@@ -272,81 +220,11 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
 
 
     TurretGenerator.scale(rand, result, WeaponType.Hookgun, tech, 0.75)
-    local specialties = TurretGenerator.addSpecialties(rand, result, WeaponType.Hookgun)
+    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

@@ -11,7 +11,7 @@ TurretIngredients[WeaponType.SmartCannon] =
     -- {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 = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
@@ -43,14 +43,3 @@ TurretIngredients[WeaponType.Hookgun] =
     {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.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

@@ -13,11 +13,11 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = fireDelay
     weapon.reach = reach
     weapon.appearanceSeed = rand:getInt()
-    weapon.seeker = 1
+    weapon.seeker = rand:test(1 / 2)
     weapon.appearance = WeaponAppearance.Cannon
     weapon.name = "Smart Cannon /* Weapon Name*/"%_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.accuracy = 0.99 - rand:getFloat(0, 0.03)
 
@@ -28,7 +28,6 @@ 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
@@ -45,8 +44,6 @@ end
 
 generatorFunction[WeaponType.SmartCannon] = WeaponGenerator.generateSmartCannon
 
-
-
 function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setProjectile()
@@ -80,6 +77,15 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     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
+
+    
     WeaponGenerator.adaptWeapon(rand, weapon, tech, material, rarity)
 
     -- these have to be assigned after the weapon was adjusted since the damage might be changed
@@ -92,7 +98,6 @@ end
 generatorFunction[WeaponType.HeavyCannon] = WeaponGenerator.generateHeavyCannon
 
 
-
 function WeaponGenerator.generateDiffuser(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setBeam()
@@ -158,7 +163,7 @@ 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/hookgun.png" 
+    weapon.icon = "data/textures/icons/harpoon.png" 
     weapon.sound = "cannon"
     weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
 
@@ -194,54 +199,3 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
 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(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

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

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/",
 }