From 60aca6d6c7cf1b4b4eb3f9551ea51ee4d75f3cad Mon Sep 17 00:00:00 2001
From: Brevven <brevingame@gmail.com>
Date: Wed, 20 Jul 2022 02:20:02 -0700
Subject: [PATCH] laser mods

---
 aluminum-burner-phase.lua   |  3 ++-
 aluminum-recipe-updates.lua | 16 ++++++++++++++++
 changelog.txt               |  5 +++++
 data-final-fixes.lua        |  9 +++++++++
 info.json                   |  5 +++--
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/aluminum-burner-phase.lua b/aluminum-burner-phase.lua
index 7acda7a..adc1bff 100644
--- a/aluminum-burner-phase.lua
+++ b/aluminum-burner-phase.lua
@@ -10,8 +10,9 @@ if not mods.Krastorio2 and not mods["aai-industry"] then
 
   -- Keep repair pack raw ingredients close to the same
   util.remove_ingredient("repair-pack", "electronic-circuit")
+  util.remove_ingredient("repair-pack", "copper-cable")
   util.add_ingredient("repair-pack", "aluminum-cable", 3)
-  util.add_to_ingredient("repair-pack", "iron-gear-wheel", 1)
+  util.set_ingredient("repair-pack", "iron-gear-wheel", 3)
 
   util.add_effect("electronics", { type = "unlock-recipe", recipe = "electronic-circuit" })
   util.add_effect("electronics", { type = "unlock-recipe", recipe = "inserter" })
diff --git a/aluminum-recipe-updates.lua b/aluminum-recipe-updates.lua
index f3d73c0..370e8e7 100644
--- a/aluminum-recipe-updates.lua
+++ b/aluminum-recipe-updates.lua
@@ -189,3 +189,19 @@ if mods.leighzerscrapyards then
   util.add_to_product("scrap-processing", "copper-plate", -1)
   util.add_product("scrap-processing", {"aluminum-plate", 2})
 end
+
+
+
+-- Rampant
+util.add_ingredient("advanced-laser-item-rampant-arsenal", "ti-sapphire", 1)
+
+-- Laser weapons
+util.add_ingredient("laser-gun", "ti-sapphire", 1)
+util.add_ingredient("laser-minigun", "ti-sapphire", 1)
+
+-- Laser Tanks
+util.add_ingredient("lasercar", "ti-sapphire", 1)
+util.add_ingredient("lasertank", "ti-sapphire", 1)
+
+-- Laser wall
+util.add_ingredient("laser-wall", "ti-sapphire", 1)
diff --git a/changelog.txt b/changelog.txt
index dc5e735..46c7b19 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.3.13
+Date: 2022-07-20
+  Changes:
+    - More laser mod compatibility, including modular turrets
+---------------------------------------------------------------------------------------------------
 Version: 0.3.12
 Date: 2022-07-14
   Fixes:
diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 0fa5eb4..33e9cb8 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -24,6 +24,15 @@ for i, entity in pairs(data.raw.furnace) do
 end
 end
 
+if mods.bztitanium then
+  util.add_ingredient("w93-modular-gun-plaser", "ti-sapphire", 1)
+  util.add_ingredient("w93-modular-gun-tlaser", "ti-sapphire", 1)
+  util.add_ingredient("w93-modular-gun-beam", "ti-sapphire", 1)
+else
+  util.add_ingredient("w93-modular-gun-plaser", "alumina", 5)
+  util.add_ingredient("w93-modular-gun-tlaser", "alumina", 5)
+  util.add_ingredient("w93-modular-gun-beam", "alumina", 5)
+end
 
 -- Must be last
 util.create_list()
diff --git a/info.json b/info.json
index e058bf6..227def3 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "bzaluminum",
-    "version": "0.3.12",
+    "version": "0.3.13",
     "factorio_version": "1.1",
     "title": "Aluminum",
     "author": "Brevven",
@@ -20,7 +20,8 @@
       "? sand-and-glass",
       "? 248k",
       "? deadlock-beltboxes-loaders",
-      "? DeadlockCrating"
+      "? DeadlockCrating",
+      "(?) scattergun_turret"
     ],
     "description": "Adds aluminum, alumina, cables, alloys and more to the game.\n\nCompatible with Krastorio 2 and Space Exploration. A standalone piece of BZ Mods."
 }