Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -1,25 +1,37 @@
-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
+
+
+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/ > test.txt'
+    - '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"

data/localization/ru.po

@@ -1,153 +1,92 @@
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua ==========
+# ========== /mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
+msgctxt "Weapon Name"
-msgid "SmartCannon"
+msgid "Smart Cannon"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "Ionized"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Prefix"
-msgid "SmartCannon"
 msgstr "Умная пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "weapon name"
+msgctxt "Weapon Prefix"
-msgid "Heavy Cannon"
+msgid "Smart Cannon"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "weapon name"
-msgid "Diffusor"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/turretgenerator.lua:
-msgctxt "weapon name"
-msgid "Hookgun"
-msgstr ""
-
-
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "SmartCannon"
 msgstr "Умная пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
 msgid "Heavy Cannon"
 msgstr "Тяжелая Пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
-msgid "Cumulative"
+msgid "Cumulative Heavy Cannon"
-msgstr ""
+msgstr "Кумулятивная тяжелая пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
 msgid "Heavy Cannon"
 msgstr "Тяжелая Пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
 msgid "Diffuser"
 msgstr "Диффузор"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+#: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
 msgid "Diffuser"
 msgstr "Диффузор"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
-msgctxt "Weapon Name"
-msgid "Harpoon"
-msgstr ""
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapongenerator.lua:
+# ========== /mods/WPE2/data/scripts/lib/weapontype.lua ==========
-msgctxt "Weapon Prefix"
+#: /mods/WPE2/data/scripts/lib/weapontype.lua:
-msgid "Harpoon"
-msgstr ""
-
-
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua ==========
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
 msgctxt "Weapon Type"
-msgid "Smart Сannon"
+msgid "Auto Сannon"
-msgstr ""
+msgstr "Автопушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
+#: /mods/WPE2/data/scripts/lib/weapontype.lua:
 msgctxt "Weapon Type"
 msgid "Heavy Cannon"
 msgstr "Тяжелая Пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
+#: /mods/WPE2/data/scripts/lib/weapontype.lua:
 msgctxt "Weapon Type"
 msgid "Diffuser"
 msgstr "Диффузор"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/lib/weapontype.lua:
-msgctxt "Weapon Type"
-msgid "Hookgun"
-msgstr ""
 
-
+# ========== /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ==========
-# ========== C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua ==========
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
 msgid "WPE Turrets"
 msgstr "Расширенный пак оружия"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
 msgid "Intro"
 msgstr "Вступление"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/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Я рекомендую использовать модели турелей из коллекции в мастерской"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
 msgid "Autocannon"
 msgstr "Автопушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/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)."
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
 msgid "Heavy Cannon"
 msgstr "Тяжелая Пушка"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/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+ 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- Требует больше экипажа"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
+#: /mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
 msgid "Energy diffuser"
 msgstr "Энегретический диффузор"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/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"
 
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-msgid "Hookgun"
-msgstr ""
-
-#: C:/Users/riksl/AppData/Roaming/Avorion/mods/WPE2/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua:
-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 ""
-
-
-# ========== old ==========
-# msgctxt "Weapon Type"
-# msgid "Auto Сannon"
-# msgstr "Автопушка"
-
-# msgctxt "Weapon Prefix"
-# msgid "Cumulative Heavy Cannon"
-# msgstr "Кумулятивная тяжелая пушка"
-
 

data/scripts/lib/galaxy.lua

@@ -1,5 +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}

data/scripts/lib/inventoryitemprice.lua

@@ -1,5 +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

data/scripts/lib/turretgenerator.lua

@@ -118,22 +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 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)
-    local specType = 1
-    if specType > 0 then 
-        weapon.prefix = "Ionized /* Weapon Prefix*/"%_t
-        weapon.shieldPenetration = 1
-    end
-
     return result
 end
 
@@ -164,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
-        weapon.prefix = "Cumulative /* Weapon Prefix*/"%_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
 
@@ -210,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 = "Diffusor /* 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
 
@@ -250,16 +220,10 @@ 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 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
 

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

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 = "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.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,7 +44,6 @@ end
 
 generatorFunction[WeaponType.SmartCannon] = WeaponGenerator.generateSmartCannon
 
-
 function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setProjectile()
@@ -79,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
@@ -156,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)
 

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