Skip to content
This repository has been archived by the owner on Nov 21, 2017. It is now read-only.

Commit

Permalink
Merge pull request #2 from gheift/master
Browse files Browse the repository at this point in the history
Split recipes into individual prototype definitions
  • Loading branch information
Afforess committed Jan 24, 2016
2 parents c51b805 + fa7dead commit 59207dc
Show file tree
Hide file tree
Showing 15 changed files with 742 additions and 797 deletions.
15 changes: 12 additions & 3 deletions data.lua
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
require("prototypes.recipe")

data.raw["item"]["pipe"].stack_size = 100
require("prototypes.item")
require("prototypes.recipe-ammo")
require("prototypes.recipe-armor")
require("prototypes.recipe-chemistry")
require("prototypes.recipe-circuit")
require("prototypes.recipe-intermediate")
require("prototypes.recipe-logistics")
require("prototypes.recipe-other")
require("prototypes.recipe-production")
require("prototypes.recipe-science")
require("prototypes.recipe-smelting")
require("prototypes.recipe-weapon")
Empty file modified info.json
100755 → 100644
Empty file.
5 changes: 5 additions & 0 deletions prototypes/item.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
data.raw["item"]["raw-wood"].fuel_value = "2MJ"
data.raw["item"]["coal"].fuel_value = "4MJ"
data.raw["item"]["solid-fuel"].fuel_value = "10MJ"

data.raw["item"]["pipe"].stack_size = 100
60 changes: 60 additions & 0 deletions prototypes/recipe-ammo.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
data:extend({
{
type = "recipe",
name = "basic-bullet-magazine",

energy_required = 2,
ingredients = {{"iron-plate", 5}},
result = "basic-bullet-magazine",
result_count = 1,
},
{
type = "recipe",
name = "piercing-bullet-magazine",
enabled = false,

energy_required = 3,
ingredients = {
{"copper-plate", 25},
{"steel-plate", 1},
},
result = "piercing-bullet-magazine",
},
{
type = "recipe",
name = "rocket",
enabled = false,

energy_required = 8,
ingredients = {
{"electronic-circuit", 1},
{"explosives", 2},
{"iron-plate", 10},
},
result = "rocket",
},
{
type = "recipe",
name = "shotgun-shell",
enabled = false,

energy_required = 3,
ingredients = {
{"copper-plate", 10},
{"iron-plate", 10},
},
result = "shotgun-shell",
},
{
type = "recipe",
name = "piercing-shotgun-shell",
enabled = false,

energy_required = 8,
ingredients = {
{"copper-plate", 10},
{"steel-plate", 2},
},
result = "piercing-shotgun-shell",
},
})
23 changes: 23 additions & 0 deletions prototypes/recipe-armor.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
data:extend({
{
type = "recipe",
name = "basic-armor",
enabled = false,

energy_required = 3,
ingredients = {{"iron-plate", 100}},
result = "basic-armor",
},
{
type = "recipe",
name = "heavy-armor",
enabled = false,

energy_required = 8,
ingredients = {
{"copper-plate", 500},
{"steel-plate", 50},
},
result = "heavy-armor",
},
})
97 changes: 97 additions & 0 deletions prototypes/recipe-chemistry.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
data:extend({
{
type = "recipe",
category = "chemistry",
name = "sulfur",
enabled = false,

energy_required = 1,
ingredients = {
{type = "fluid", name = "water", amount = 3},
{type = "fluid", name = "petroleum-gas", amount = 3},
},
results = {{type = "item", name = "sulfur", amount = 1}},
},
{
type = "recipe",
category = "chemistry",
subgroup = "fluid-recipes",
name = "sulfuric-acid",
enabled = false,

energy_required = 1,
ingredients = {
{type = "item", name = "sulfur", amount = 5},
{type = "item", name = "iron-plate", amount = 2},
{type = "fluid", name = "water", amount = 10},
},
results = {{type = "fluid", name = "sulfuric-acid", amount = 2}},
},
{
type = "recipe",
category = "chemistry",
name = "battery",
enabled = false,

energy_required = 6,
ingredients = {
{type = "fluid", name = "sulfuric-acid", amount = 3},
{type = "item", name = "iron-plate", amount = 10},
{type = "item", name = "copper-plate", amount = 10},
},
results = {{type = "item", name = "battery", amount = 1}},
},

{
type = "recipe",
category = "chemistry",
subgroup = "fluid-recipes",
enabled = false,
name = "solid-fuel-from-heavy-oil",

energy_required = 3,
ingredients = {{type = "fluid", name = "heavy-oil", amount = 6}},
results = {{type = "item", name = "solid-fuel", amount = 1}},

icon = "__base__/graphics/icons/solid-fuel-from-heavy-oil.png",
},
{
type = "recipe",
category = "chemistry",
subgroup = "fluid-recipes",
name = "solid-fuel-from-light-oil",
enabled = false,

energy_required = 3,
ingredients = {{type = "fluid", name="light-oil", amount = 4}},
results = {{type = "item", name="solid-fuel", amount = 1}},

icon = "__base__/graphics/icons/solid-fuel-from-light-oil.png",
},

{
type = "recipe",
category = "chemistry",
subgroup = "fluid-recipes",
name = "solid-fuel-from-petroleum-gas",
enabled = false,

energy_required = 3,
ingredients = {{type = "fluid", name = "petroleum-gas", amount = 8}},
results= {{type = "item", name = "solid-fuel", amount = 1}},

icon = "__base__/graphics/icons/solid-fuel-from-petroleum-gas.png",
},

{
type = "recipe",
category = "chemistry",
subgroup = "fluid-recipes",
name = "lubricant",
enabled = false,

energy_required = 1,
ingredients = {{type = "fluid", name = "heavy-oil", amount = 2}},
results = {{type = "fluid", name = "lubricant", amount = 1}},
},
})
51 changes: 51 additions & 0 deletions prototypes/recipe-circuit.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
data:extend(
{
{
type = "recipe",
name = "copper-cable",

energy_required = 2,
ingredients = {{"copper-plate", 10}},
result = "copper-cable",
result_count = 2,
},
{
type = "recipe",
name = "electronic-circuit",

energy_required = 8,
ingredients = {
{"iron-plate", 10},
{"copper-cable", 10},
},
result = "electronic-circuit",
},
--[[
{
type = "recipe",
name = "advanced-circuit",
enabled = false,
energy_required = 16,
ingredients = {
{"electronic-circuit", 5},
{"plastic-bar", 5},
{"copper-cable", 10},
},
result = "advanced-circuit",
},
]]
{
type = "recipe",
name = "advanced-circuit",
enabled = false,

energy_required = 8,
ingredients = {
{"electronic-circuit", 2},
{"plastic-bar", 4},
{"copper-cable", 4},
},
result = "advanced-circuit"
},
})
32 changes: 32 additions & 0 deletions prototypes/recipe-intermediate.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
data:extend({
{
type = "recipe",
name = "iron-gear-wheel",

energy_required = 1.5,
ingredients = {{"iron-plate", 5}},
result = "iron-gear-wheel",
},
{
type = "recipe",
name = "iron-stick",

ingredients = {{"iron-plate", 5}},
result = "iron-stick",
result_count = 2,
},
{
type = "recipe",
-- category = "crafting",
name = "low-density-structure",
enabled = false,

energy_required = 30,
ingredients = {
{"steel-plate", 10},
{"copper-plate", 25},
{"plastic-bar", 10},
},
result= "low-density-structure",
},
})
Loading

0 comments on commit 59207dc

Please sign in to comment.