Update file weapongenerator.lua

data/localization/ru.po

@@ -1,140 +0,0 @@
-msgid ""
-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"
-
-# ========== \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 "WPE Турели"
-
-#: \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 "В этой части энциклопедии вы найдете описание турелей из мода Weapon Pack Extended.\n\nЯ рекомендую использовать модели турелей из коллекции в мастерской."
-
-#: \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 "Облегченный вариант классической пушки.\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:
-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 "Пушка главного калибра. Стреляет тяжелыми разрывными снарядами, попадание которых может смести корабль противника.\n\n+ Высокий урон\n+ Высокая скорость полета снаряда\n+ При попадании толкает противника\n+ Также может иметь пробитие\n- Низкая скорострельность\n- Занимает много слотов\n- Большие размеры\n- Требуется больше экипажа"
-
-#: \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 "Боевое оружие малой дальности. Не наносит повреждений корпусу, но чрезвычайно эффективно разрушает щиты. Требует гражданских слотов.\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/scripts/lib/turretgenerator.lua

@@ -126,6 +126,18 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
 
     local weapon = WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
+    
+    local name = "Smart-Cannon /* weapon name*/"%_T
+    
+    local specType = rand:getInt(0, 2)
+    if specType == 1 then 
+        name = "Ionized Smart-Cannon /* weapon name*/"%_T
+        weapon.shieldPenetration = 1
+    elseif specType == 2 then
+        name = "Plasmed Smart-Cannon /* weapon name*/"%_T
+        weapon.damageType = DamageType.Plasma
+        weapon.damage = weapon.damage * 0.9
+    end
 
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
@@ -140,18 +152,6 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
-    local name = "Smart-Cannon /* weapon name*/"%_T
-    
-    local specType = rand:getInt(0, 2)
-    if specType == 1 then 
-        name = "Ionized Smart-Cannon /* weapon name*/"%_T
-        weapon.shieldPenetration = 1
-    elseif specType == 2 then
-        name = "Plasmed Smart-Cannon /* weapon name*/"%_T
-        result.damageType = DamageType.Plasma
-        weapon.damage = weapon.damage * 0.9
-    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] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
@@ -168,7 +168,7 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     -- generate turret
     local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
     local crew = Crew()
-    crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
+    crew:add(requiredCrew * 3, CrewMan(CrewProfessionType.Gunner))
     crew:add(requiredCrew, CrewMan(CrewProfessionType.Repair))
     result.crew = crew
 
@@ -178,6 +178,12 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     local weapon = WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
 
+    local Pen = rand:getInt(0, rarity.value)
+    if Pen > 0 then 
+        weapon.blockPenetration = Pen
+        outerAdjective = "Cumulative "%_T
+    end
+
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
 
@@ -195,12 +201,6 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
 
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
    
-    local Pen = rand:getInt(0, rarity.value)
-    if Pen > 0 then 
-        weapon.blockPenetration = Pen
-        outerAdjective = "Cumulative "%_T
-    end
-
     if result.size >= 4 then
         name = "Mons Meg /* weapon name*/"%_T
     end
@@ -286,6 +286,8 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
     result.slotType = TurretSlotType.Armed
     result:updateStaticStats()
 
+    local name = "Hookgun /* weapon name*/"%_T
+
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
     result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 

data/scripts/lib/weapongenerator.lua

@@ -7,7 +7,7 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     local fireDelay = rand:getFloat(1.5, 2.5)*0.5
     local reach = rand:getFloat(1100, 1500)*0.7
     local damage = dps * fireDelay
-    local speed = rand:getFloat(300, 400)*2
+    local speed = rand:getFloat(300, 400)*4
     local existingTime = (reach / speed)*1.2
 
     weapon.fireDelay = fireDelay