From 4dc4497657d6a9d19cf5615ce5e2ba7d2283662b Mon Sep 17 00:00:00 2001
From: Hornwitser <github@hornwitser.no>
Date: Wed, 22 Jan 2020 04:20:44 +0100
Subject: [PATCH] Overwrite ScienceCostTweakerM's changes

Add hidden dependency on SciencCostTweakerM to overwrite it's changes
and remove the icons table on the entities modified to avoid it taking
precedence over the icon set by cb-science.
---
 src/changelog.txt        |  6 ++++++
 src/data-final-fixes.lua | 11 +++++++++++
 src/info.json            |  8 ++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/changelog.txt b/src/changelog.txt
index 56548c4..7e1b70d 100644
--- a/src/changelog.txt
+++ b/src/changelog.txt
@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.2
+Date: 22. 01. 2020
+  Changes:
+    - Remove icons table on overwritten entites to avoid it taking precedence.
+    - Added ScienceCostTweaker Mod (mexmer) as a hidden dependency to overwrite its changes.
+---------------------------------------------------------------------------------------------------
 Version: 0.2.1
 Date: 07. 12. 2019
   Changes:
diff --git a/src/data-final-fixes.lua b/src/data-final-fixes.lua
index e86828f..ec17084 100644
--- a/src/data-final-fixes.lua
+++ b/src/data-final-fixes.lua
@@ -1,36 +1,47 @@
+local unset = {} -- Marker to set attribute to nil
 local items = {
     ["automation-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/red.png",
+        icons = unset,
     },
     ["logistic-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/green.png",
+        icons = unset,
     },
     ["military-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/black.png",
+        icons = unset,
     },
     ["chemical-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/cyan.png",
+        icons = unset,
     },
     ["production-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/purple.png",
+        icons = unset,
     },
     ["utility-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/yellow.png",
+        icons = unset,
     },
     ["space-science-pack"] = {
         icon_size = 128,
         icon = "__cb-science__/graphics/white.png",
+        icons = unset,
     },
 }
 
 for name, definition in pairs(items) do
     for property, value in pairs(definition) do
+        if value == unset then
+            value = nil
+        end
         if data.raw.technology[name] then
             data.raw.technology[name][property] = value
         end
diff --git a/src/info.json b/src/info.json
index 82d4536..526fe18 100644
--- a/src/info.json
+++ b/src/info.json
@@ -1,9 +1,13 @@
 {
     "name": "cb-science",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "title": "Colour Blind Friendly Science Packs",
     "author": "Hornwitser",
     "contact": "Hornwitser#6431 on Discord",
     "description": "Alternative icons for science packs",
-    "factorio_version": "0.17"
+    "factorio_version": "0.17",
+    "dependencies": [
+        "base",
+        "(?) ScienceCostTweakerM"
+    ]
 }
\ No newline at end of file