From 02197506155ae2d0c2787cd1c98656d58ef97d26 Mon Sep 17 00:00:00 2001 From: Slava Date: Sat, 26 Aug 2023 22:06:28 +0000 Subject: [PATCH] Renamed 'harpoon' to 'Hookgun' --- .gitignore | 1 + .gitlab-ci.yml | 6 +----- .vs/slnx.sqlite | Bin 90112 -> 90112 bytes ...2eb55490-95f2-433f-aa17-865b872ad041.vsidx | Bin 40098 -> 0 bytes .vs/weapon-project-extended/v17/.wsuo | Bin 11264 -> 12288 bytes data/scripts/lib/galaxy.lua | 2 +- data/scripts/lib/inventoryitemprice.lua | 2 +- data/scripts/lib/turretgenerator.lua | 16 ++++++++-------- data/scripts/lib/turretingredients.lua | 2 +- data/scripts/lib/weapongenerator.lua | 8 ++++---- data/scripts/lib/weapontype.lua | 2 +- .../ui/encyclopedia/chapters/wpeturrets.lua | 6 ++++++ 12 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 .gitignore delete mode 100644 .vs/weapon-project-extended/FileContentIndex/2eb55490-95f2-433f-aa17-865b872ad041.vsidx diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc8b1e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vs/* \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e68bd9a..036a948 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ release_job: image: registry.gitlab.com/gitlab-org/release-cli:latest only: - - "data/.*" + - "data/*" - "modinfo.lua" - "thumb.png" - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -15,10 +15,6 @@ release_job: script: - echo "Release WPE 2.0_$CI_COMMIT_SHORT_SHA" - - rm -rf .vs - - rm .gitlab-ci.yml - - rm CHANGELOG - - rm README.md release: tag_name: v2.0.$CI_PIPELINE_IID diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index de3f17fe09143e54e7eb1ad220e59d99d9dba8fd..a96e16658aa4ddd77e7ed46ca4d5352a8fef5886 100644 GIT binary patch delta 189 zcmZoTz}j$tb%Hb_`$QRMM)r*flk^!iHhS|H_;2zn@Jnx&O8Cz=Ss|Z=Q3FUm0UGAP!2g{$ Yg4bg+Pk|M$06&W&1Bz)8wJRP00Ie50)c^nh delta 123 zcmV->0EGX5zy*N71&|v71(6&>0R^#Ok}m-#v-2+z5CbO*(US*2PqPsadkeGCOEUxr zCk>qd5BLq8vkp*z4UwP`vz=XM0v0C^AOH{i5BCr95A6@=591Hs57`eOvm9Xm4v|m? dlOS*82qz6#01x*KShEgrIt`Ja60=x+sN%ZkDvkgE diff --git a/.vs/weapon-project-extended/FileContentIndex/2eb55490-95f2-433f-aa17-865b872ad041.vsidx b/.vs/weapon-project-extended/FileContentIndex/2eb55490-95f2-433f-aa17-865b872ad041.vsidx deleted file mode 100644 index 06ef812d9cd66beae92d6f0f5fea829871723ee5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40098 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 aPD{Lr4B-v(^_=1tn*49oz>KfW&-lOdugg3D diff --git a/.vs/weapon-project-extended/v17/.wsuo b/.vs/weapon-project-extended/v17/.wsuo index 5d32b5096f5e301bd81036f5dba88a1f3e227d20..ed31ae258c231d30bf17c0aafb57190b3a337368 100644 GIT binary patch delta 331 zcmZpOXh@h~Aj`x61p*8VEI=kB5dZuC|365Sd9opg_{M}ejGLHpSojV&Cce$Qag&i7 zDAT|`xr(WZQFilJHhD$~pz{AhP<`w`ngfVAfq1eGhm4>okRb-dAVpk2`rpRD<&2ZK zGB~7x92p?qoWM1KaS;#8B!z~_4a_p!VGM>0W(?*G#tg=j6`3R%wI&~AGH2X4IZ(`d z@)3nSi-cGOagheg zBqf2#0xCN=KyHMo-uy*{hjEft17pqP6H*zbdJO3dnG7XBoX(KPkk3%WkjhYDt8hMd pC;ywEZ?`iho;#@P_;pE(*cE{U)`=mp&t*MNF#v-{c(S3`c>tsxWViqT delta 206 zcmZojXo#3#Aj<#)0t^hiKsF-~|NH;{KS-EyvLT1~#)LVHo0xJ~cpIi)SrC8YCL=dc zreSg=Q#GUH=C5q>j1odX0ahU91Y(d@4k$fYheL*y9mwH=nKOwiV{?wo6vl}OEQ@$p zCW$%oGV%fC1%Vi-@Bd^*L6ylRV*Znzd3`4fD1TTa#4<_CVRM641LNcbL5Il>5)PXk bBo6RyQgLRSe3;2_@&Rd<$rY*{i!@jORGK^J diff --git a/data/scripts/lib/galaxy.lua b/data/scripts/lib/galaxy.lua index 1126147..2dddc65 100644 --- a/data/scripts/lib/galaxy.lua +++ b/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.Harpoon] = {d = 0.6, p = 1.0} \ No newline at end of file diff --git a/data/scripts/lib/inventoryitemprice.lua b/data/scripts/lib/inventoryitemprice.lua index f4de73f..1a01a43 100644 --- a/data/scripts/lib/inventoryitemprice.lua +++ b/data/scripts/lib/inventoryitemprice.lua @@ -2,4 +2,4 @@ valueWeights[WeaponType.SmartCannon ] = 2 valueWeights[WeaponType.HeavyCannon ] = 1.7 valueWeights[WeaponType.Diffuser ] = 2.1 -valueWeights[WeaponType.Harpoon ] = 2.1 +valueWeights[WeaponType.Hookgun ] = 2.1 diff --git a/data/scripts/lib/turretgenerator.lua b/data/scripts/lib/turretgenerator.lua index 1b35180..1aded3f 100644 --- a/data/scripts/lib/turretgenerator.lua +++ b/data/scripts/lib/turretgenerator.lua @@ -22,7 +22,7 @@ scales[WeaponType.Diffuser] = { {from = 51, to = 52, size = 3.0, usedSlots = 6}, } -scales[WeaponType.Harpoon] = { +scales[WeaponType.Hookgun] = { {from = 0, to = 46, size = 1.0, usedSlots = 2}, {from = 47, to = 50, size = 2.0, usedSlots = 4}, --dummy for cooaxial, add 1 to size and level @@ -82,13 +82,13 @@ else end if GameVersion() >= Version(0, 31, 0) then - possibleSpecialties[WeaponType.Harpoon] = { + possibleSpecialties[WeaponType.Hookgun] = { {specialty = Specialty.HighDamage, probability = 0.3}, {specialty = Specialty.HighRange, probability = 0.3}, -- {specialty = Specialty.FasterRechargeTime, probability = 0.6}, } else - possibleSpecialties[WeaponType.Harpoon] = { + possibleSpecialties[WeaponType.Hookgun] = { Specialty.HighDamage, Specialty.HighRange, Specialty.FasterRechargeTime, @@ -196,7 +196,7 @@ end generatorFunction[WeaponType.Diffuser] = TurretGenerator.generateDiffuserTurret -function TurretGenerator.generateHarpoonTurret(rand, dps, tech, material, rarity) +function TurretGenerator.generateHookgunTurret(rand, dps, tech, material, rarity) local result = TurretTemplate() -- generate turret @@ -208,7 +208,7 @@ function TurretGenerator.generateHarpoonTurret(rand, dps, tech, material, rarity -- generate weapons local numWeapons = rand:getInt(1, 2) - local weapon = WeaponGenerator.generateHarpoon(rand, dps, tech, material, rarity) + local weapon = WeaponGenerator.generateHookgun(rand, dps, tech, material, rarity) weapon.damage = weapon.damage / numWeapons -- attach weapons to turret @@ -219,12 +219,12 @@ function TurretGenerator.generateHarpoonTurret(rand, dps, tech, material, rarity TurretGenerator.createBatteryChargeCooling(result, rechargeTime, shootingTime) - TurretGenerator.scale(rand, result, WeaponType.Harpoon, tech, 0.75) - TurretGenerator.addSpecialties(rand, result, WeaponType.Harpoon) + TurretGenerator.scale(rand, result, WeaponType.Hookgun, tech, 0.75) + TurretGenerator.addSpecialties(rand, result, WeaponType.Hookgun) result:updateStaticStats() return result end -generatorFunction[WeaponType.Harpoon] = TurretGenerator.generateHarpoonTurret +generatorFunction[WeaponType.Hookgun] = TurretGenerator.generateHookgunTurret diff --git a/data/scripts/lib/turretingredients.lua b/data/scripts/lib/turretingredients.lua index 1e2b20d..bb972e3 100644 --- a/data/scripts/lib/turretingredients.lua +++ b/data/scripts/lib/turretingredients.lua @@ -33,7 +33,7 @@ TurretIngredients[WeaponType.Diffuser] = -- {name = "Targeting System", amount = 0, investable = 2, minimum = 0, turretStat = "automatic", investFactor = 1, changeType = StatChanges.Flat}, } -TurretIngredients[WeaponType.Harpoon] = +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", }, diff --git a/data/scripts/lib/weapongenerator.lua b/data/scripts/lib/weapongenerator.lua index 53f5863..a655c40 100644 --- a/data/scripts/lib/weapongenerator.lua +++ b/data/scripts/lib/weapongenerator.lua @@ -148,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() weapon:setBeam() @@ -161,8 +161,8 @@ function WeaponGenerator.generateHarpoon(rand, dps, tech, material, rarity) weapon.reach = reach weapon.continuousBeam = true weapon.appearance = WeaponAppearance.Cannon - weapon.name = "Harpoon /* Weapon Name*/"%_t - weapon.prefix = "Harpoon /* Weapon Prefix*/"%_t + weapon.name = "Hookgun /* Weapon Name*/"%_t + weapon.prefix = "Hookgun /* Weapon Prefix*/"%_t weapon.icon = "data/textures/icons/harpoon.png" weapon.sound = "cannon" weapon.accuracy = 0.99 - rand:getFloat(0, 0.02) @@ -198,4 +198,4 @@ function WeaponGenerator.generateHarpoon(rand, dps, tech, material, rarity) return weapon end -generatorFunction[WeaponType.Harpoon] = WeaponGenerator.generateHarpoon +generatorFunction[WeaponType.Hookgun] = WeaponGenerator.generateHookgun diff --git a/data/scripts/lib/weapontype.lua b/data/scripts/lib/weapontype.lua index 6f71649..34c892c 100644 --- a/data/scripts/lib/weapontype.lua +++ b/data/scripts/lib/weapontype.lua @@ -2,4 +2,4 @@ WeaponTypes.addType("SmartCannon", "Smart Сannon /* Weapon Type */"%_t, armed) WeaponTypes.addType("HeavyCannon", "Heavy Cannon /* Weapon Type */"%_t, armed) WeaponTypes.addType("Diffuser", "Diffuser /* Weapon Type */"%_t, armed) -WeaponTypes.addType("Harpoon", "Harpoon /* Weapon Type */"%_t, armed) \ No newline at end of file +WeaponTypes.addType("Hookgun", "Hookgun /* Weapon Type */"%_t, armed) \ No newline at end of file diff --git a/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua b/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua index 16e248f..356b3c5 100644 --- a/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua +++ b/data/scripts/player/ui/encyclopedia/chapters/wpeturrets.lua @@ -31,4 +31,10 @@ category.chapters = text = "Short range combat weapon. Does not cause damage to the hull, but extremely effectively destroys shields. Requires civil slots.\n\nShield Damage x20"%_t, }, + { + title = "Hookgun"%_t, + picture = "data/textures/slide/1.png", + text = "Short range combat weapon. Does not cause damage to the hull, but extremely effectively destroys shields. Requires civil slots.\n\nShield Damage x20"%_t, + }, + }