Update 2 files

- /data/localization/ru.po
- /data/scripts/lib/weapongenerator.lua

.gitlab-ci.yml

@@ -6,15 +6,20 @@ release_job:
   stage: release  # It only runs when *both* jobs in the test stage complete successfully.
   image: registry.gitlab.com/gitlab-org/release-cli:latest
 
-  rules:
-    - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
-    - if: $CI_COMMIT_TAG
-      when: never  
-    - if: 
-      changes:
-        - data/**/*
-        - modinfo.lua
-        - thumb.png
+  only:
+    # - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+    refs:
+      - main
+      - ^tags
+    changes:
+      - ^README.md
+      - ^CHANGELOG
+      - ^.gitattribute
+      - ^.gitignore
+      - ^.gitlab-ci.yml
+      - data/**/*
+      - modinfo.lua
+      - thumb.png
 
   script:
     - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA"

README.md

@@ -1,7 +1,5 @@
-[![pipeline status](http://gl.beaconborn.ru/bacon/weapon-project-extended/badges/main/pipeline.svg)](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/commits/main)
-# weapon project extended
-
-
+[![pipeline status](http://gl.beaconborn.ru/bacon/weapon-project-extended/badges/main/pipeline.svg)](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/commits/main) [![Latest Release](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/badges/release.svg)](http://gl.beaconborn.ru/bacon/weapon-project-extended/-/releases)
+# weapon project extended 2.0
 
 ## Getting started
 

data/localization/ru.po

@@ -1,12 +1,12 @@
 # ========== /mods/WPE2/data/scripts/lib/weapongenerator.lua ==========
 #: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Name"
-msgid "Smart Cannon"
+msgid "SmartCannon"
 msgstr "Умная пушка"
 
 #: /mods/WPE2/data/scripts/lib/weapongenerator.lua:
 msgctxt "Weapon Prefix"
-msgid "Smart Cannon"
+msgid "SmartCannon"
 msgstr "Умная пушка"
 
 #: /mods/WPE2/data/scripts/lib/weapongenerator.lua:

data/scripts/lib/weapongenerator.lua

@@ -13,10 +13,10 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.fireDelay = fireDelay
     weapon.reach = reach
     weapon.appearanceSeed = rand:getInt()
-    weapon.seeker = rand:test(1 / 2)
+    weapon.seeker = 1
     weapon.appearance = WeaponAppearance.Cannon
-    weapon.name = "Smart Cannon /* Weapon Name*/"%_t
-    weapon.prefix = "Smart Cannon /* Weapon Prefix*/"%_t
+    weapon.name = "SmartCannon /* Weapon Name*/"%_t
+    weapon.prefix = "SmartCannon /* Weapon Prefix*/"%_t
     weapon.icon = "data/textures/icons/autocannon.png" 
     weapon.sound = "cannon"
     weapon.accuracy = 0.99 - rand:getFloat(0, 0.03)
@@ -28,6 +28,14 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.impactSound = 1
     weapon.impactExplosion = true
 
+    local specType = rand:getInt(0, 1)
+    if specType > 0 then 
+        weapon.prefix = "Ionized SmartCannon /* Weapon Prefix*/"%_t
+        weapon.shieldPenetration = 1
+    else
+        weapon.prefix = "SmartCannon /* Weapon Prefix*/"%_t
+    end
+
     weapon.psize = rand:getFloat(0.2, 0.5)
     weapon.pmaximumTime = existingTime
     weapon.pvelocity = speed
@@ -44,6 +52,7 @@ end
 
 generatorFunction[WeaponType.SmartCannon] = WeaponGenerator.generateSmartCannon
 
+
 function WeaponGenerator.generateHeavyCannon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setProjectile()
@@ -148,7 +157,7 @@ generatorFunction[WeaponType.Diffuser] = WeaponGenerator.generateDiffuser
 
 
 
-function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
+function WeaponGenerator.generateHarpoon(rand, dps, tech, material, rarity)
     local weapon = Weapon()
     weapon:setBeam()
 
@@ -161,8 +170,8 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
     weapon.reach = reach
     weapon.continuousBeam = true
     weapon.appearance = WeaponAppearance.Cannon
-    weapon.name = "Hookgun /* Weapon Name*/"%_t
-    weapon.prefix = "Hookgun /* Weapon Prefix*/"%_t
+    weapon.name = "Harpoon /* Weapon Name*/"%_t
+    weapon.prefix = "Harpoon /* Weapon Prefix*/"%_t
     weapon.icon = "data/textures/icons/harpoon.png" 
     weapon.sound = "cannon"
     weapon.accuracy = 0.99 - rand:getFloat(0, 0.02)
@@ -198,4 +207,4 @@ function WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity)
     return weapon
 end
 
-generatorFunction[WeaponType.Hookgun] = WeaponGenerator.generateHookgun
+generatorFunction[WeaponType.Harpoon] = WeaponGenerator.generateHarpoon

modinfo.lua

@@ -20,7 +20,7 @@ meta =
 
     -- 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
-    version = "1.3",
+    version = "2.0",
 
     -- If your mod requires dependencies, enter them here. The game will check that all dependencies given here are met.
     -- Possible attributes: