Update to 0.15. Temporarily removed Fire hazard concrete until graphi…

…cs for it can be updated.
justarandomgeek · Apr 25, 2017 · 9b3addf · 9b3addf
1 parent d1a512f
commit 9b3addf
Show file tree

Hide file tree

Showing 87 changed files with 38 additions and 109 deletions.
diff --git a/graphics/concrete/black/concrete-inner-corner.png b/graphics/concrete/black/concrete-inner-corner.png
diff --git a/graphics/concrete/black/concrete-o.png b/graphics/concrete/black/concrete-o.png
diff --git a/graphics/concrete/black/concrete-outer-corner.png b/graphics/concrete/black/concrete-outer-corner.png
diff --git a/graphics/concrete/black/concrete-side.png b/graphics/concrete/black/concrete-side.png
diff --git a/graphics/concrete/black/concrete-u.png b/graphics/concrete/black/concrete-u.png
diff --git a/graphics/concrete/black/concrete1.png b/graphics/concrete/black/concrete1.png
diff --git a/graphics/concrete/black/concrete2.png b/graphics/concrete/black/concrete2.png
diff --git a/graphics/concrete/black/concrete4.png b/graphics/concrete/black/concrete4.png
diff --git a/graphics/concrete/blue/concrete-inner-corner.png b/graphics/concrete/blue/concrete-inner-corner.png
diff --git a/graphics/concrete/blue/concrete-o.png b/graphics/concrete/blue/concrete-o.png
diff --git a/graphics/concrete/blue/concrete-outer-corner.png b/graphics/concrete/blue/concrete-outer-corner.png
diff --git a/graphics/concrete/blue/concrete-side.png b/graphics/concrete/blue/concrete-side.png
diff --git a/graphics/concrete/blue/concrete-u.png b/graphics/concrete/blue/concrete-u.png
diff --git a/graphics/concrete/blue/concrete1.png b/graphics/concrete/blue/concrete1.png
diff --git a/graphics/concrete/blue/concrete2.png b/graphics/concrete/blue/concrete2.png
diff --git a/graphics/concrete/blue/concrete4.png b/graphics/concrete/blue/concrete4.png
diff --git a/graphics/concrete/cyan/concrete-inner-corner.png b/graphics/concrete/cyan/concrete-inner-corner.png
diff --git a/graphics/concrete/cyan/concrete-o.png b/graphics/concrete/cyan/concrete-o.png
diff --git a/graphics/concrete/cyan/concrete-outer-corner.png b/graphics/concrete/cyan/concrete-outer-corner.png
diff --git a/graphics/concrete/cyan/concrete-side.png b/graphics/concrete/cyan/concrete-side.png
diff --git a/graphics/concrete/cyan/concrete-u.png b/graphics/concrete/cyan/concrete-u.png
diff --git a/graphics/concrete/cyan/concrete1.png b/graphics/concrete/cyan/concrete1.png
diff --git a/graphics/concrete/cyan/concrete2.png b/graphics/concrete/cyan/concrete2.png
diff --git a/graphics/concrete/cyan/concrete4.png b/graphics/concrete/cyan/concrete4.png
diff --git a/graphics/concrete/green/concrete-inner-corner.png b/graphics/concrete/green/concrete-inner-corner.png
diff --git a/graphics/concrete/green/concrete-o.png b/graphics/concrete/green/concrete-o.png
diff --git a/graphics/concrete/green/concrete-outer-corner.png b/graphics/concrete/green/concrete-outer-corner.png
diff --git a/graphics/concrete/green/concrete-side.png b/graphics/concrete/green/concrete-side.png
diff --git a/graphics/concrete/green/concrete-u.png b/graphics/concrete/green/concrete-u.png
diff --git a/graphics/concrete/green/concrete1.png b/graphics/concrete/green/concrete1.png
diff --git a/graphics/concrete/green/concrete2.png b/graphics/concrete/green/concrete2.png
diff --git a/graphics/concrete/green/concrete4.png b/graphics/concrete/green/concrete4.png
diff --git a/graphics/concrete/magenta/concrete-inner-corner.png b/graphics/concrete/magenta/concrete-inner-corner.png
diff --git a/graphics/concrete/magenta/concrete-o.png b/graphics/concrete/magenta/concrete-o.png
diff --git a/graphics/concrete/magenta/concrete-outer-corner.png b/graphics/concrete/magenta/concrete-outer-corner.png
diff --git a/graphics/concrete/magenta/concrete-side.png b/graphics/concrete/magenta/concrete-side.png
diff --git a/graphics/concrete/magenta/concrete-u.png b/graphics/concrete/magenta/concrete-u.png
diff --git a/graphics/concrete/magenta/concrete1.png b/graphics/concrete/magenta/concrete1.png
diff --git a/graphics/concrete/magenta/concrete2.png b/graphics/concrete/magenta/concrete2.png
diff --git a/graphics/concrete/magenta/concrete4.png b/graphics/concrete/magenta/concrete4.png
diff --git a/graphics/concrete/orange/concrete-inner-corner.png b/graphics/concrete/orange/concrete-inner-corner.png
diff --git a/graphics/concrete/orange/concrete-o.png b/graphics/concrete/orange/concrete-o.png
diff --git a/graphics/concrete/orange/concrete-outer-corner.png b/graphics/concrete/orange/concrete-outer-corner.png
diff --git a/graphics/concrete/orange/concrete-side.png b/graphics/concrete/orange/concrete-side.png
diff --git a/graphics/concrete/orange/concrete-u.png b/graphics/concrete/orange/concrete-u.png
diff --git a/graphics/concrete/orange/concrete1.png b/graphics/concrete/orange/concrete1.png
diff --git a/graphics/concrete/orange/concrete2.png b/graphics/concrete/orange/concrete2.png
diff --git a/graphics/concrete/orange/concrete4.png b/graphics/concrete/orange/concrete4.png
diff --git a/graphics/concrete/purple/concrete-inner-corner.png b/graphics/concrete/purple/concrete-inner-corner.png
diff --git a/graphics/concrete/purple/concrete-o.png b/graphics/concrete/purple/concrete-o.png
diff --git a/graphics/concrete/purple/concrete-outer-corner.png b/graphics/concrete/purple/concrete-outer-corner.png
diff --git a/graphics/concrete/purple/concrete-side.png b/graphics/concrete/purple/concrete-side.png
diff --git a/graphics/concrete/purple/concrete-u.png b/graphics/concrete/purple/concrete-u.png
diff --git a/graphics/concrete/purple/concrete1.png b/graphics/concrete/purple/concrete1.png
diff --git a/graphics/concrete/purple/concrete2.png b/graphics/concrete/purple/concrete2.png
diff --git a/graphics/concrete/purple/concrete4.png b/graphics/concrete/purple/concrete4.png
diff --git a/graphics/concrete/red/concrete-inner-corner.png b/graphics/concrete/red/concrete-inner-corner.png
diff --git a/graphics/concrete/red/concrete-o.png b/graphics/concrete/red/concrete-o.png
diff --git a/graphics/concrete/red/concrete-outer-corner.png b/graphics/concrete/red/concrete-outer-corner.png
diff --git a/graphics/concrete/red/concrete-side.png b/graphics/concrete/red/concrete-side.png
diff --git a/graphics/concrete/red/concrete-u.png b/graphics/concrete/red/concrete-u.png
diff --git a/graphics/concrete/red/concrete1.png b/graphics/concrete/red/concrete1.png
diff --git a/graphics/concrete/red/concrete2.png b/graphics/concrete/red/concrete2.png
diff --git a/graphics/concrete/red/concrete4.png b/graphics/concrete/red/concrete4.png
diff --git a/graphics/concrete/white/concrete-inner-corner.png b/graphics/concrete/white/concrete-inner-corner.png
diff --git a/graphics/concrete/white/concrete-o.png b/graphics/concrete/white/concrete-o.png
diff --git a/graphics/concrete/white/concrete-outer-corner.png b/graphics/concrete/white/concrete-outer-corner.png
diff --git a/graphics/concrete/white/concrete-side.png b/graphics/concrete/white/concrete-side.png
diff --git a/graphics/concrete/white/concrete-u.png b/graphics/concrete/white/concrete-u.png
diff --git a/graphics/concrete/white/concrete1.png b/graphics/concrete/white/concrete1.png
diff --git a/graphics/concrete/white/concrete2.png b/graphics/concrete/white/concrete2.png
diff --git a/graphics/concrete/white/concrete4.png b/graphics/concrete/white/concrete4.png
diff --git a/graphics/concrete/yellow/concrete-inner-corner.png b/graphics/concrete/yellow/concrete-inner-corner.png
diff --git a/graphics/concrete/yellow/concrete-o.png b/graphics/concrete/yellow/concrete-o.png
diff --git a/graphics/concrete/yellow/concrete-outer-corner.png b/graphics/concrete/yellow/concrete-outer-corner.png
diff --git a/graphics/concrete/yellow/concrete-side.png b/graphics/concrete/yellow/concrete-side.png
diff --git a/graphics/concrete/yellow/concrete-u.png b/graphics/concrete/yellow/concrete-u.png
diff --git a/graphics/concrete/yellow/concrete1.png b/graphics/concrete/yellow/concrete1.png
diff --git a/graphics/concrete/yellow/concrete2.png b/graphics/concrete/yellow/concrete2.png
diff --git a/graphics/concrete/yellow/concrete4.png b/graphics/concrete/yellow/concrete4.png
diff --git a/info.json b/info.json
@@ -1,10 +1,10 @@
 {
   "name": "color-coding",
-  "version": "1.1.1",
+  "version": "1.15.1",
   "title": "Color Coding",
   "author": "D3Phoenix, justarandomgeek",
-  "homepage": "http://www.factorioforums.com/forum/viewtopic.php?f=144&t=13907",
-  "factorio_version": "0.14",
+  "homepage": "",
+  "factorio_version": "0.15",
   "dependencies": ["base >= 0.13"],
   "description": "Adds color-coded indicator lamps, and concrete."
 }
diff --git a/migrations/1.0.9-update-prototypes.json b/migrations/1.0.9-update-prototypes.json
diff --git a/migrations/1.0.9-update-recipes.lua b/migrations/1.0.9-update-recipes.lua
diff --git a/prototypes/config.lua b/prototypes/config.lua
@@ -28,14 +28,14 @@ COLOR_TABLE["black"  ]={r=0.1, g=0.1, b=0.1}
 -- To add another concrete all you have to do is add an appropriate line here,
 -- then make a new folder in graphics/concrete/ to match and add your texture assets there.
 FIRE_CONCRETE_TABLE = {}
-FIRE_CONCRETE_TABLE["fire-left"   ]={r=1.0, g=0.5, b=0.5}
-FIRE_CONCRETE_TABLE["fire-right"  ]={r=1.0, g=0.5, b=0.5}
+--FIRE_CONCRETE_TABLE["fire-left"   ]={r=1.0, g=0.5, b=0.5}
+--FIRE_CONCRETE_TABLE["fire-right"  ]={r=1.0, g=0.5, b=0.5}
 
 --  Note that when adding to either table above, you will also need to create/update locale strings in ./locale/en/en.cfg to match.
 
 
 
--- This table controls what color is "next" when rotating to change colors. 
+-- This table controls what color is "next" when rotating to change colors.
 NEXT_COLOR_TABLE = {}
 
 NEXT_COLOR_TABLE["fire-left" ]="fire-right"

diff --git a/prototypes/items.lua b/prototypes/items.lua
@@ -21,23 +21,23 @@ if ENABLE_CONCRETE then
         if i < 10 then pad = "0" else pad = "" end
         add_concrete(color,rgb,pad,i)
     end
-    
-    table.insert(color_items,
-    {
-      type = "item",
-      name = "fire-hazard-concrete",
-      icon = MOD_NAME.."/graphics/concrete/fire-left/icon.png",
-      flags = {"goes-to-main-inventory"},
-      subgroup = "terrain",
-      order = "b[concrete]-b[fire]",
-      stack_size = 100,
-      place_as_tile =
-      {
-        result = "concrete-fire-left",
-        condition_size = 4,
-        condition = { "water-tile" }
-      }
-    })
+
+    --table.insert(color_items,
+    --{
+    --  type = "item",
+    --  name = "fire-hazard-concrete",
+    --  icon = MOD_NAME.."/graphics/concrete/fire-left/icon.png",
+    --  flags = {"goes-to-main-inventory"},
+    --  subgroup = "terrain",
+    --  order = "b[concrete]-b[fire]",
+    --  stack_size = 100,
+    --  place_as_tile =
+    --  {
+    --    result = "concrete-fire-left",
+    --    condition_size = 4,
+    --    condition = { "water-tile" }
+    --  }
+    --})
 
 end
 

diff --git a/prototypes/recipes.lua b/prototypes/recipes.lua
@@ -20,20 +20,20 @@ if ENABLE_CONCRETE then
         add_concrete(color,rgb)
     end
 
-    table.insert(color_recipes,
-    {
-    type = "recipe",
-    name = "fire-hazard-concrete",
-    energy_required = 0.25,
-    enabled = false,
-    category = "crafting",
-    ingredients =
-    {
-      {"concrete", 10}
-    },
-    result= "fire-hazard-concrete",
-    result_count = 10
-    })
+    --table.insert(color_recipes,
+    --{
+    --type = "recipe",
+    --name = "fire-hazard-concrete",
+    --energy_required = 0.25,
+    --enabled = false,
+    --category = "crafting",
+    --ingredients =
+    --{
+    --  {"concrete", 10}
+    --},
+    --result= "fire-hazard-concrete",
+    --result_count = 10
+    --})
 end
 
 if ENABLE_LAMPS then

diff --git a/prototypes/technologies.lua b/prototypes/technologies.lua
@@ -14,7 +14,7 @@ if ENABLE_CONCRETE then
     for color,rgb in pairs(COLOR_TABLE) do
         table.insert(concrete.effects, { type="unlock-recipe", recipe="concrete-"..color })
     end
-    table.insert(concrete.effects, { type="unlock-recipe", recipe="fire-hazard-concrete" })
+    --table.insert(concrete.effects, { type="unlock-recipe", recipe="fire-hazard-concrete" })
     table.insert(color_technologies, concrete)
 end