diff --git a/data/localization/ru.po b/data/localization/ru.po index 901a75c..d6a500d 100644 --- a/data/localization/ru.po +++ b/data/localization/ru.po @@ -1,86 +1,91 @@ -# ========== /WPE2/data/scripts/lib/weapongenerator.lua ========== -#: /WPE2/data/scripts/lib/weapongenerator.lua: +# ========== /mods/WPE2/data/scripts/lib/weapongenerator.lua ========== +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: msgctxt "Weapon Name" msgid "Auto Cannon" msgstr "Автопушка" -#: /WPE2/data/scripts/lib/weapongenerator.lua: +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: msgctxt "Weapon Prefix" msgid "Auto Cannon" msgstr "Автопушка" -#: /WPE2/data/scripts/lib/weapongenerator.lua: +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: msgctxt "Weapon Name" msgid "Heavy Cannon" msgstr "Тяжелая Пушка" -#: /WPE2/data/scripts/lib/weapongenerator.lua: +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: +msgctxt "Weapon Prefix" +msgid "Cumulative Heavy Cannon" +msgstr "Кумулятивная тяжелая пушка" + +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: msgctxt "Weapon Prefix" msgid "Heavy Cannon" msgstr "Тяжелая Пушка" -#: /WPE2/data/scripts/lib/weapongenerator.lua: +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: msgctxt "Weapon Name" msgid "Diffuser" msgstr "Диффузор" -#: /WPE2/data/scripts/lib/weapongenerator.lua: +#: /mods/WPE2/data/scripts/lib/weapongenerator.lua: msgctxt "Weapon Prefix" msgid "Diffuser" msgstr "Диффузор" -# ========== /WPE2/data/scripts/lib/weapontype.lua ========== -#: /WPE2/data/scripts/lib/weapontype.lua: +# ========== /mods/WPE2/data/scripts/lib/weapontype.lua ========== +#: /mods/WPE2/data/scripts/lib/weapontype.lua: msgctxt "Weapon Type" msgid "Auto Сannon" msgstr "Автопушка" -#: /WPE2/data/scripts/lib/weapontype.lua: +#: /mods/WPE2/data/scripts/lib/weapontype.lua: msgctxt "Weapon Type" msgid "Heavy Cannon" msgstr "Тяжелая Пушка" -#: /WPE2/data/scripts/lib/weapontype.lua: +#: /mods/WPE2/data/scripts/lib/weapontype.lua: msgctxt "Weapon Type" msgid "Diffuser" msgstr "Диффузор" -# ========== /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ========== -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +# ========== /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ========== +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "WPE Turrets" msgstr "Расширенный пак оружия" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "Intro" msgstr "Вступление" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "In this part of the encyclopedia you will find a description of the turrets from the Weapon Pack Extended mod.\n\nI recommend using turret models from the collection in the workshop." msgstr "В этой части энциклопедии вы найдете описание турелей из мода Weapon Pack Extended. \n\nЯ рекомендую использовать модели турелей из коллекции в мастерской" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "Autocannon" msgstr "Автопушка" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "A lightweight version of the classic cannon.\n\nCompared to conventional cannons:\n+ Increased rate of fire (x2)\n+ Increased projectile speed (x1.5)\n+ A little more damage on the shield (10% - 15%)\n+ Can be equipped with homing missiles.\n- Less damage (x0.75)\n- Shorter damage range (x0.8)" msgstr "Облегченная версия классической пушки.\n\nПо сравнению с обычными пушками:\n+ Увеличенная скорострельность (x2)\n+ Увеличенная скорость полета снаряда (x1.5)\n+ Немного больший урон по щиту (10% - 15%)\n+ Может оснащаться самонаводящимися ракетами.\n- Меньший урон (x0.75)\n- Меньшая дальность поражения (x0.8)." -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "Heavy Cannon" msgstr "Тяжелая Пушка" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "The cannon of the main caliber. It shoots with heavy explosive shells, the hit of which can displace the enemy ship.\n\n+ High damage\n+ High projectile speed\n+ When hit, push the opponent\n- Low rate of fire\n- Occupies many slots\n- Big size" msgstr "Пушка главного калибра. Стреляет тяжелыми разрывными снарядами, попадание которых может смести вражеский корабль.\n\n+ Большой урон\n+ Высокая скорость снаряда\n+ При попадании в цель толкает противника\n- Низкая скорострельность\n- Занимает много слотов\n- Большие размеры" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "Energy diffuser" msgstr "Энегретический диффузор" -#: /WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: +#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua: msgid "Short range combat weapon. Does not cause damage to the hull, but extremely effectively destroys shields. Requires civil slots.\n\nShield Damage x20" msgstr "Боевое оружие малой дальности. Не наносит повреждений корпусу, но чрезвычайно эффективно разрушает щиты. Требует гражданских слотов.\n\nУрон по щитам x20" diff --git a/data/scripts/lib/turretgenerator.lua b/data/scripts/lib/turretgenerator.lua index 3c5cf95..420118a 100644 --- a/data/scripts/lib/turretgenerator.lua +++ b/data/scripts/lib/turretgenerator.lua @@ -114,7 +114,8 @@ 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*2, CrewMan(CrewProfessionType.Gunner)) + crew:add(requiredCrew, CrewMan(CrewProfessionType.Repair)) result.crew = crew -- generate weapons diff --git a/data/scripts/lib/weapongenerator.lua b/data/scripts/lib/weapongenerator.lua index 2091468..e1b1604 100644 --- a/data/scripts/lib/weapongenerator.lua +++ b/data/scripts/lib/weapongenerator.lua @@ -7,8 +7,8 @@ function WeaponGenerator.generateAutoCannon(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)*1.5 - local existingTime = (reach / speed)*1.1 + local speed = rand:getFloat(300, 400)*2 + local existingTime = (reach / speed)*1.2 weapon.fireDelay = fireDelay weapon.reach = reach @@ -50,10 +50,10 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity) weapon:setProjectile() dps = dps * 1.85 - local fireDelay = rand:getFloat(1.5, 2.5)*1.8 - local reach = rand:getFloat(1100, 1500)*0.5 + local fireDelay = rand:getFloat(1.5, 2.0)*1.7 + local reach = rand:getFloat(1100, 1500)*1.2 local damage = dps * fireDelay - local speed = rand:getFloat(600, 1000) + local speed = rand:getFloat(600, 1000)*1.4 local existingTime = (reach / speed)*1.1 weapon.fireDelay = fireDelay @@ -61,10 +61,9 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity) weapon.appearanceSeed = rand:getInt() weapon.appearance = WeaponAppearance.Bolter weapon.name = "Heavy Cannon /* Weapon Name*/"%_t - weapon.prefix = "Heavy Cannon /* Weapon Prefix*/"%_t weapon.icon = "data/textures/icons/heavycannon.png" weapon.sound = "cannon" - weapon.accuracy = 0.89 - rand:getFloat(0, 0.03) + weapon.accuracy = 0.95 - rand:getFloat(0, 0.02) weapon.damage = damage weapon.damageType = DamageType.Physical @@ -73,11 +72,21 @@ function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity) 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.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 diff --git a/data/textures/icons/16353.png b/data/textures/icons/16353.png deleted file mode 100644 index 3c40cd6..0000000 Binary files a/data/textures/icons/16353.png and /dev/null differ diff --git a/data/textures/icons/heavycannon.png b/data/textures/icons/heavycannon.png index b95ad83..17016f5 100644 Binary files a/data/textures/icons/heavycannon.png and b/data/textures/icons/heavycannon.png differ diff --git a/data/textures/icons/ram.png b/data/textures/icons/ram.png deleted file mode 100644 index 34557b6..0000000 Binary files a/data/textures/icons/ram.png and /dev/null differ