Update file turretgenerator.lua

- /data/scripts/lib/weapongenerator.lua
- /data/scripts/lib/turretgenerator.lua
- /data/scripts/lib/turretingredients.lua

data/localization/ru.po

@@ -1,5 +1,5 @@
 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"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2023-09-01 03:33+0000\nPO-Revision-Date: 2023-09-02 07:30+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:
@@ -10,7 +10,7 @@ msgstr "Умная пушка"
 #: \data\scripts\lib\turretgenerator.lua:
 msgctxt "weapon name"
 msgid "Ionized SmartCannon"
-msgstr "Ионизирующая умная пушка"
+msgstr "Ионизирущая умная пушка"
 
 #: \data\scripts\lib\turretgenerator.lua:
 msgctxt "weapon name"
@@ -20,7 +20,7 @@ msgstr "Тяжелое орудие"
 #: \data\scripts\lib\turretgenerator.lua:
 msgctxt "weapon name"
 msgid "Cumulative Heavy Cannon"
-msgstr "Кумулятивное тяжелое орудие"
+msgstr "Кумулятивная тяжелая пушка"
 
 #: \data\scripts\lib\turretgenerator.lua:
 msgctxt "weapon name"
@@ -85,56 +85,67 @@ msgstr "Роевая ракетная установка"
 
 # ========== \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua ==========
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 msgctxt ""
 msgid "WPE Turrets"
 msgstr "WPE Турели"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 msgctxt ""
 msgid "Intro"
 msgstr "Вступление"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 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.nnЯ рекомендую использовать модели турелей из коллекции в мастерской."
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 msgctxt ""
 msgid "SmartCannon"
 msgstr "Умная пушка"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 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 "Облегченный вариант классической пушки.nnПо сравнению с обычными пушками:\\n+ Увеличенная скорострельность (x2)\\n+ Увеличенная скорость полета снаряда (x1,5)\\n+ Немного больше урон по щиту (10% - 15%)\\n+ Может быть оснащена самонаводящимися ракетами.\\n- Меньший урон (x0,75)\\n- Меньшая дальность поражения (x0,8)"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 msgctxt ""
 msgid "Heavy Cannon"
 msgstr "Тяжелое орудие"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 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:
+#, fuzzy
 msgctxt ""
 msgid "Energy diffuser"
 msgstr "Энегретический диффузор"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 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"
+msgstr "Боевое оружие малой дальности. Не наносит повреждений корпусу, но чрезвычайно эффективно разрушает щиты. Требует гражданских слотов.\\n\\nУрон по щитам x20"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 msgctxt ""
 msgid "Hookgun"
 msgstr "Гарпун"
 
 #: \data\scripts\player\ui\encyclopedia\chapters\wpeturrets.lua:
+#, fuzzy
 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"
+msgstr "Боевое оружие малой дальности. Не наносит урона щиту, но чрезвычайно эффективно для атак. Требует 2 слота для стрелков.nМожет иметь проникающую способность\n"

data/scripts/lib/turretgenerator.lua

@@ -112,6 +112,7 @@ else
     }
 end
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -119,6 +120,7 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
     local crew = Crew()
     crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
+    crew:add(requiredCrew, CrewMan(CrewProfessionType.Pilot))
     result.crew = crew
 
     -- generate weapons
@@ -126,6 +128,14 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
 
     local weapon = WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
+    
+    local specType = rand:getInt(0, 2)
+    if specType == 1 then
+        weapon.shieldPenetration = 1
+    elseif specType == 2 then
+        weapon.damageType = DamageType.Plasma
+        weapon.damage = weapon.damage * 0.9
+    end
 
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
@@ -141,19 +151,13 @@ function TurretGenerator.generateSmartCannonTurret(rand, dps, tech, material, ra
     result:updateStaticStats()
 
     local name = "Smart-Cannon /* weapon name*/"%_T
-    
-    local specType = rand:getInt(0, 2)
+    local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
     if specType == 1 then 
-        name = "Ionized Smart-Cannon /* weapon name*/"%_T
-        weapon.shieldPenetration = 1
+        outerAdjective = "Ionized "%_T
     elseif specType == 2 then
-        name = "Plasmed Smart-Cannon /* weapon name*/"%_T
-        weapon.damageType = DamageType.Plasma
+        outerAdjective = "Plasmed "%_T
         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)
 
     return result
@@ -162,13 +166,14 @@ end
 generatorFunction[WeaponType.SmartCannon] = TurretGenerator.generateSmartCannonTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
     -- generate turret
     local requiredCrew = TurretGenerator.dpsToRequiredCrew(dps)
     local crew = Crew()
-    crew:add(requiredCrew, CrewMan(CrewProfessionType.Gunner))
+    crew:add(requiredCrew * 3, CrewMan(CrewProfessionType.Gunner))
     crew:add(requiredCrew, CrewMan(CrewProfessionType.Repair))
     result.crew = crew
 
@@ -178,6 +183,22 @@ function TurretGenerator.generateHeavyCannonTurret(rand, dps, tech, material, ra
     local weapon = WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = weapon.fireDelay * numWeapons
 
+    local Pen = rand:getInt(0, rarity.value)
+    if Pen > 0 then 
+        weapon.blockPenetration = Pen
+        outerAdjective = "Cumulative "%_T
+    end
+
+    if result.size >= 4 then
+        weapon.speed = weapon.speed * 2
+        weapon.reach = weapon.reach * 1.2
+    end
+
+    if result.size >= 5 then
+        weapon.speed = weapon.speed * 2
+        weapon.reach = weapon.reach * 1.5
+    end
+
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
 
@@ -195,18 +216,12 @@ 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
+        name = "Mass Driver /* weapon name*/"%_T
     end
 
     if result.size >= 5 then
-        name = "Dulle Griet /* weapon name*/"%_T
+        name = "Mass Warper /* weapon name*/"%_T
     end
 
     result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
@@ -217,6 +232,7 @@ end
 generatorFunction[WeaponType.HeavyCannon] = TurretGenerator.generateHeavyCannonTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateDiffuserTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -257,6 +273,7 @@ end
 generatorFunction[WeaponType.Diffuser] = TurretGenerator.generateDiffuserTurret
 
 
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 
@@ -271,6 +288,13 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
 
     local weapon = WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
     weapon.damage = weapon.damage / numWeapons
+    
+    local spec = rand:getInt(0, 1)
+    
+    if spec then
+        weapon.holdingForce = weapon.otherForce * 2
+        weapon.otherForce = 0
+    end
 
     -- attach weapons to turret
     TurretGenerator.attachWeapons(rand, result, weapon, numWeapons)
@@ -289,6 +313,11 @@ function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity
     local name = "Hookgun /* weapon name*/"%_T
 
     local dmgAdjective, outerAdjective, barrel, multishot, coax, serial = makeTitleParts(rand, specialties, result, DamageType.Physical)
+
+    if spec then
+        outerAdjective = "Stabilizing"%_T
+    end
+
     result.title = Format("%1%%2%%3%%4%%5%%6%%7% /* [outer-adjective][barrel][coax][dmg-adjective][multishot][name][serial] */"%_T, outerAdjective, barrel, coax, dmgAdjective, multishot, name, serial)
 
     return result
@@ -297,7 +326,7 @@ end
 generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret
 
 
-
+ -- ===========================================================================================================================================================
 function TurretGenerator.generateHiveLauncherTurret(rand, dps, tech, material, rarity)
     local result = TurretTemplate()
 

data/scripts/lib/turretingredients.lua

@@ -2,9 +2,9 @@
 TurretIngredients[WeaponType.SmartCannon] =
 {
     {name = "Servo",                amount = 15,   investable = 10, minimum = 5,    weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
-    {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
-    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
-    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage",   investFactor = 0.5,},
+    {name = "Processor",            amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
+    {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach",    investFactor = 1.5, changeType = StatChanges.Percentage},
+    {name = "Ammunition M",     	amount = 2,    investable = 4,  minimum = 1,    weaponStat = "damage",   investFactor = 1,   changeType = StatChanges.Percentage},
     {name = "Targeting Card",       amount = 3,    investable = 3,  minimum = 0,    weaponStat = "seeker",   investFactor = 1,   changeType = StatChanges.Flat},
     {name = "Steel",                amount = 8,    investable = 10, minimum = 3,},
     {name = "Steel Tube",           amount = 5,    investable = 10, minimum = 3,},
@@ -13,9 +13,9 @@ TurretIngredients[WeaponType.SmartCannon] =
 TurretIngredients[WeaponType.HeavyCannon] =
 {
     {name = "Servo",                amount = 8,    investable = 8,  minimum = 4,    weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
-    {name = "Warhead",              amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
+    {name = "Explosive Charge",     amount = 5,    investable = 6,  minimum = 1,    weaponStat = "damage",  },
     {name = "High Pressure Tube",   amount = 2,    investable = 6,  minimum = 1,    weaponStat = "reach", },
-    {name = "Ammunition",           amount = 5,    investable = 10, minimum = 3,    weaponStat = "damage",   investFactor = 0.2,},
+    {name = "Ammunition L",         amount = 5,    investable = 10, minimum = 3,    weaponStat = "damage",   investFactor = 0.2,},
     {name = "Steel",                amount = 20,   investable = 10, minimum = 20,},
     {name = "Metal Plate",          amount = 8,    investable = 10, minimum = 10,},
 }
@@ -24,20 +24,19 @@ TurretIngredients[WeaponType.Diffuser] =
 {
     {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
     {name = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
-    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
+    {name = "Industrial Tesla Coil",amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
     {name = "Steel",                amount = 20,   investable = 0,  minimum = 20,},
     {name = "Copper",               amount = 10,   investable = 0,  minimum = 10,},
     {name = "Silver",               amount = 5,    investable = 0,  minimum = 5,},
 }
 
-TurretIngredients[WeaponType.Hookgun] = -- TODO Подумать над составляющими
+TurretIngredients[WeaponType.Hookgun] =
 {
-    {name = "Plasma Cell",          amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
-    {name = "High Capacity Lens",   amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
-    {name = "Energy Tube",          amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
+    {name = "Force Generator",      amount = 10,   investable = 10, minimum = 10,   weaponStat = "fireRate", investFactor = 1.0, changeType = StatChanges.Percentage},
+    {name = "Energy Tube",          amount = 5,    investable = 6,  minimum = 1,    weaponStat = "reach",  },
+    {name = "Power Unit",           amount = 2,    investable = 6,  minimum = 1,    weaponStat = "damage", },
     {name = "Steel",                amount = 20,   investable = 0,  minimum = 20,},
-    {name = "Copper",               amount = 10,   investable = 0,  minimum = 10,},
-    {name = "Silver",               amount = 5,    investable = 0,  minimum = 5,},
+    {name = "Conductor",            amount = 10,   investable = 0,  minimum = 10,},
 }
 
 TurretIngredients[WeaponType.HiveLauncher] =

data/scripts/lib/weapongenerator.lua

@@ -3,11 +3,11 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setProjectile()
 
-    dps = dps * 0.75
+    dps = dps * 0.9
     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
@@ -53,7 +53,7 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
 
     dps = dps * 1.85
     local fireDelay = rand:getFloat(1.5, 2.0)*1.7
-    local reach = rand:getFloat(1100, 1500)*1.2
+    local reach = rand:getFloat(1100, 1500)*1.5
     local damage = dps * fireDelay
     local speed = rand:getFloat(600, 1000)*1.4
     local existingTime = (reach / speed)*1.1