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 de3f17f..a96e166 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ 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 06ef812..0000000 Binary files a/.vs/weapon-project-extended/FileContentIndex/2eb55490-95f2-433f-aa17-865b872ad041.vsidx and /dev/null differ diff --git a/.vs/weapon-project-extended/v17/.wsuo b/.vs/weapon-project-extended/v17/.wsuo index 5d32b50..ed31ae2 100644 Binary files a/.vs/weapon-project-extended/v17/.wsuo and b/.vs/weapon-project-extended/v17/.wsuo differ 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, + }, + }