From 1eec0fba6c612a8255903986b114c22d431904c3 Mon Sep 17 00:00:00 2001
From: bacon <beaconborn@yandex.ru>
Date: Sun, 27 Aug 2023 20:01:07 +0300
Subject: [PATCH] up

---
 data/scripts/lib/turretingredients.lua | 2 +-
 data/scripts/lib/weapongenerator.lua   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/scripts/lib/turretingredients.lua b/data/scripts/lib/turretingredients.lua
index bb972e3..a72d8ce 100644
--- a/data/scripts/lib/turretingredients.lua
+++ b/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.SmartCannon] =
+TurretIngredients[WeaponType.HeavyCannon] =
 {
     {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",  },
diff --git a/data/scripts/lib/weapongenerator.lua b/data/scripts/lib/weapongenerator.lua
index 4b358e6..fb5e2b0 100644
--- a/data/scripts/lib/weapongenerator.lua
+++ b/data/scripts/lib/weapongenerator.lua
@@ -16,7 +16,7 @@ function WeaponGenerator.generateSmartCannon(rand, dps, tech, material, rarity)
     weapon.seeker = 1
     weapon.appearance = WeaponAppearance.Cannon
     weapon.name = "SmartCannon /* Weapon Name*/"%_t
-    weapon.prefix = "SmartCannon /* Weapon Prefix*/"%_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)
@@ -157,7 +157,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()
 
@@ -207,4 +207,4 @@ function WeaponGenerator.generateHarpoon(rand, dps, tech, material, rarity)
     return weapon
 end
 
-generatorFunction[WeaponType.Harpoon] = WeaponGenerator.generateHarpoon
+generatorFunction[WeaponType.Hookgun] = WeaponGenerator.generateHookgun