Update to 0.16

api/add_science_fluid.lua

@@ -16,6 +16,7 @@ function addScienceFluid(name,base_color,flow_color,icon)
       pressure_to_speed_ratio = 0.4,
       flow_to_energy_ratio = 0.59,
       order = "e[lubricant]",
+      icon_size = 32
     }
   })
 end

api/add_science_recipe.lua

@@ -1,22 +1,27 @@
 parseScienceRecipe = require("api.parse_science_recipe")
+getScienceCount = require("api.get_science_count")
+getScienceEnergy = require("api.get_science_energy")
 
 function addScienceRecipe(name,recipe,result,count,energy)
   data:extend({
    {
       type = "recipe",
       name = name.."-fluid",
       category= "science-pump",
-      energy_required = energy,
+      energy_required = energy or getScienceEnergy(name),
       ingredients = parseScienceRecipe(recipe,name),
+      subgroup = "intermediate-product",
       results = {
         {
-          type="fluid",
-          name= result,
-          amount= count
+          type ="fluid",
+          name = result,
+          amount = count or getScienceCount(name)
         }
-      }
+      },
+      result_count = count or getScienceCount(name);
     }
   })
+  table.insert(data.raw["recipe"][name.."-fluid"]["ingredients"], {type="fluid",name="water",amount=100})
 end
 
 return addScienceRecipe

api/get_science_count.lua

@@ -0,0 +1,6 @@
+
+function getScienceCount(name)
+  return data.raw["recipe"][name]["result_count"] or 1;
+end
+
+return getScienceCount;

api/get_science_energy.lua

@@ -0,0 +1,6 @@
+
+function getScienceEnergy(name)
+  return data.raw["recipe"][name]["energy"] or 1;
+end
+
+return getScienceCount;

api/parse_science_recipe.lua

@@ -2,6 +2,7 @@ string.split = require("api.split")
 
 function parseScienceRecipe(s,name)
   if(type(s) == "string") then
+    data.raw["recipe"][name]["category"]="science-pump";
     if(s == "default") then
       return data.raw["recipe"][name]["ingredients"];
     end

data.lua

@@ -1 +1,5 @@
 require("prototypes.data")
+
+-- future todo:
+-- space rockets should bring down space dust that you add to water to get science
+-- labs should accept science fluid

info.json

@@ -2,10 +2,10 @@
   "name": "liquid-science",
   "version": "0.1.2",
   "title": "Liquid Science",
-  "factorio_version": "0.14",
-  "author": "pfg and other people",
-  "contact": "a contact should go here",
-  "homepage": "a url should go here",
+  "factorio_version": "0.16",
+  "author": "pfg",
+  "contact": "pfgithub on github",
+  "homepage": "https://github.com/pfgithub/liquid-science",
   "description": "A mod that turnes science into a liquid that you have to fill science packs with",
-  "dependencies": ["base >= 0.4.1"]
+  "dependencies": ["base >= 0.16.20"]
 }

prototypes/entity/data.lua

@@ -1,3 +1 @@
--- require("prototypes.entity.smelter_inserter")
-
 require("prototypes.entity.science_pump")

prototypes/entity/science_pump.lua

@@ -122,6 +122,7 @@ data:extend({
     energy_usage = "210kW",
     ingredient_count = 4,
     crafting_categories = {"science-pump"},
+    icon_size = 32,
     fluid_boxes =
     {
       {

prototypes/item/data.lua

@@ -1,5 +1,3 @@
--- require("prototypes.item.smelter_inserter")
-
 require("prototypes.item.science_pump")
 require("prototypes.item.sand")
 require("prototypes.item.glass")

prototypes/item/glass.lua

@@ -5,6 +5,7 @@ data:extend({
     order = "b-c-a",
     stack_size = 50,
     flags = { "goes-to-main-inventory" },
-    icon = "__liquid-science__/graphics/icons/resource/glass.png"
+    icon = "__liquid-science__/graphics/icons/resource/glass.png",
+    icon_size = 32
   }
 })

prototypes/item/sand.lua

@@ -5,6 +5,8 @@ data:extend({
     order = "b-c-a",
     stack_size = 50,
     flags = { "goes-to-main-inventory" },
-    icon = "__liquid-science__/graphics/icons/resource/sand-ore.png"
+    --icon = "__liquid-science__/graphics/icons/resource/sand-ore.png",
+    icon = "__liquid-science__/graphics/icons/resource/sand-ore-texture.png",
+    icon_size = 54
   }
 })

prototypes/item/science_pump.lua

@@ -6,6 +6,7 @@ data:extend({
     stack_size = 50,
     flags = { "goes-to-quickbar" },
     icon = "__liquid-science__/graphics/icons/chemical-plant.png",
-    place_result = "science-pump"
+    place_result = "science-pump",
+    icon_size = 20
   }
 })

prototypes/recipe/data.lua

@@ -1,17 +1,3 @@
---[[data:extend({
- {
-    type = "recipe",
-    name = "smelter-inserter",
-    enabled = "true",
-    ingredients = {
-      {"iron-stick",50},
-      {"electronic-circuit",50},
-      {"iron-gear-wheel",50},
-      {"iron-plate",200}
-    },
-    result = "smelter-inserter"
-  }
-})]]--
 
 data:extend({
  {

prototypes/resource/data.lua

@@ -35,7 +35,8 @@ data:extend({
     type = "autoplace-control",
     name = "sand-ore",
     richness = true,
-    order = "g-s"
+    order = "g-s",
+    category = "resource"
   }
 })
 
@@ -67,6 +68,7 @@ data:extend({
         variation_count = 1
       }
     },
+    icon_size = 20,
     map_color = {r=0.85, g=0.765, b=0.608}
   }
 })

prototypes/science/data.lua

@@ -5,4 +5,15 @@ data:extend({
   }
 })
 
-require("settings")
+-- until 0.15, this will be manual
+addScience = require("api.add_science")
+
+--208, 177, 21 high tech
+
+addScience("science-pack-1", "0.8,0.2,0.1", "0.7,0.1,0.1", "default")
+addScience("science-pack-2", "0.2,0.9,0.2", "0.1,0.8,0.2", "default")
+addScience("science-pack-3", "0.24,0.86,0.95", "0.22,0.68,0.77", "default")
+addScience("military-science-pack", "0.19607843137,0.2431372549,0.2862745098", "0.22,0.68,0.77", "default")
+addScience("production-science-pack", "0.85,0.11,0.92", "0.78,0.1,0.83", "default")
+addScience("high-tech-science-pack", "0.81568627451,0.69411764705,0.08235294117", "0.22,0.68,0.77", "default")
+--addScience("space-science-pack", "0.24,0.86,0.95", "0.22,0.68,0.77", "default", 12, 1)