Compare commits

..

56 Commits

Author SHA1 Message Date
Slava
6e6b3aa8a6 Update .gitlab-ci.yml file 2023-08-28 20:05:28 +00:00
Slava
812a652bed Update .gitlab-ci.yml file 2023-08-28 20:04:11 +00:00
Slava
19e0acdf6d Update .gitlab-ci.yml file 2023-08-28 20:02:19 +00:00
Slava
d21c529591 Update .gitlab-ci.yml file 2023-08-28 19:56:23 +00:00
Slava
7d08a6bdfc Update .gitlab-ci.yml file 2023-08-28 19:54:11 +00:00
Slava
83dddbea1e Update .gitlab-ci.yml file 2023-08-28 19:52:59 +00:00
Slava
8c3ff4993b Update .gitlab-ci.yml file 2023-08-28 19:52:33 +00:00
Slava
34d41c4c5b Update .gitlab-ci.yml file 2023-08-28 19:49:30 +00:00
Slava
efce751464 Update .gitlab-ci.yml file 2023-08-28 19:49:01 +00:00
Slava
02a32a81f2 Update .gitlab-ci.yml file 2023-08-28 19:46:01 +00:00
Slava
90c76900e1 Update .gitlab-ci.yml file 2023-08-28 19:44:10 +00:00
Slava
4cb196b579 Update .gitlab-ci.yml file 2023-08-28 19:43:48 +00:00
Slava
30343d47a0 Update .gitlab-ci.yml file 2023-08-28 19:33:58 +00:00
Slava
7410e3f488 Update .gitlab-ci.yml file 2023-08-28 19:25:56 +00:00
Slava
36434648d6 Update .gitlab-ci.yml file 2023-08-28 19:22:19 +00:00
Slava
42c671c3a7 Update .gitlab-ci.yml file 2023-08-28 19:21:27 +00:00
Slava
aa6c42b840 Update .gitlab-ci.yml file 2023-08-28 18:47:34 +00:00
Slava
92e0636354 Update .gitlab-ci.yml file 2023-08-28 18:40:33 +00:00
Slava
f84cc424b1 Update .gitlab-ci.yml file 2023-08-28 18:39:16 +00:00
Slava
1e11687962 Update .gitlab-ci.yml file 2023-08-28 18:31:56 +00:00
Slava
07a05df171 Update .gitlab-ci.yml file 2023-08-28 18:22:08 +00:00
Slava
4c101287bf Update .gitlab-ci.yml file 2023-08-28 18:21:26 +00:00
Slava
a16f0be550 Update .gitlab-ci.yml file 2023-08-28 18:18:42 +00:00
Slava
6915961e99 Update .gitlab-ci.yml file 2023-08-28 18:16:18 +00:00
Slava
1612ba9195 Update .gitlab-ci.yml file 2023-08-28 18:10:57 +00:00
Slava
44fef51edd Update .gitlab-ci.yml file 2023-08-28 18:08:29 +00:00
Slava
946a585ec7 Update .gitlab-ci.yml file 2023-08-28 18:06:37 +00:00
Slava
cd6210888b Update .gitlab-ci.yml file 2023-08-28 18:05:38 +00:00
Slava
ccf5c37ec8 Update .gitlab-ci.yml file 2023-08-28 18:02:50 +00:00
Slava
0edade93c1 Update .gitlab-ci.yml file 2023-08-28 18:00:00 +00:00
Slava
ce80b62b82 Update .gitlab-ci.yml file 2023-08-28 17:56:48 +00:00
Slava
80d1d57d94 Update .gitlab-ci.yml file 2023-08-28 17:55:38 +00:00
Slava
1d21757453 Update .gitlab-ci.yml file 2023-08-28 17:54:10 +00:00
Slava
4644383c73 Update .gitlab-ci.yml file 2023-08-28 17:52:09 +00:00
Slava
a99b373b25 Update .gitlab-ci.yml file 2023-08-28 17:50:52 +00:00
Slava
7cf0b95477 Update .gitlab-ci.yml file 2023-08-28 17:49:32 +00:00
Slava
ae4e872b74 Update .gitlab-ci.yml file 2023-08-28 17:47:04 +00:00
Slava
4e5f0a0f89 Update .gitlab-ci.yml file 2023-08-28 17:45:14 +00:00
Slava
599872b114 Update .gitlab-ci.yml file 2023-08-28 17:42:46 +00:00
Slava
e11ab2dae5 Update .gitlab-ci.yml file 2023-08-28 17:41:46 +00:00
Slava
d46d044e2d Update .gitlab-ci.yml file 2023-08-28 17:40:01 +00:00
Slava
b81d07eb49 Update .gitlab-ci.yml file 2023-08-28 17:39:25 +00:00
Slava
0f744108b0 Update .gitlab-ci.yml file 2023-08-28 17:37:14 +00:00
Slava
e92fa54cac Update .gitlab-ci.yml file 2023-08-28 17:29:00 +00:00
Slava
c4a48cbed4 Update .gitlab-ci.yml file 2023-08-28 17:27:14 +00:00
Slava
cdabe00195 Update .gitlab-ci.yml file 2023-08-28 17:26:59 +00:00
Slava
60c589fb74 Update .gitlab-ci.yml file 2023-08-28 17:26:12 +00:00
Slava
5024ed74d4 Update .gitlab-ci.yml file 2023-08-28 17:26:00 +00:00
Slava
8f1f252601 Update .gitlab-ci.yml file 2023-08-28 17:25:00 +00:00
Slava
927da67587 Update .gitlab-ci.yml file 2023-08-28 17:24:29 +00:00
Slava
ce4627919f Update .gitlab-ci.yml file 2023-08-28 17:20:56 +00:00
Slava
ee48cf94c5 Update .gitlab-ci.yml file 2023-08-28 17:18:37 +00:00
Slava
3f5c906577 Update .gitlab-ci.yml file 2023-08-28 17:16:16 +00:00
Slava
d6450e63c0 Update .gitlab-ci.yml file 2023-08-28 17:15:32 +00:00
Slava
71e17e719b Update .gitlab-ci.yml file 2023-08-28 17:05:46 +00:00
Slava
d5c9874b2b Update .gitlab-ci.yml file 2023-08-28 17:05:33 +00:00
3 changed files with 223 additions and 220 deletions

View File

@@ -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 - 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: release_job:
needs:
- prepare_job
stage: release # It only runs when *both* jobs in the test stage complete successfully. stage: release # It only runs when *both* jobs in the test stage complete successfully.
image: registry.gitlab.com/gitlab-org/release-cli:latest image: registry.gitlab.com/gitlab-org/release-cli:latest
only: only:
# - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" # - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
refs: refs:
- main - testing
- ^tags - ^tags
changes: changes:
- ^README.md
- ^CHANGELOG
- ^.gitattribute
- ^.gitignore
- ^.gitlab-ci.yml
- data/**/* - data/**/*
- modinfo.lua - modinfo.lua
- thumb.png - thumb.png
- test.txt
script: script:
- echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA" - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA"

View File

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

View File

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