diff --git a/sources/thumbnail.afphoto b/sources/thumbnail.afphoto new file mode 100644 index 0000000..3bad747 Binary files /dev/null and b/sources/thumbnail.afphoto differ diff --git a/wooden-arig/data.lua b/wooden-arig/data.lua new file mode 100644 index 0000000..a2b16aa --- /dev/null +++ b/wooden-arig/data.lua @@ -0,0 +1,2 @@ +require("prototypes/content/data") +require("prototypes/compatibility/data") \ No newline at end of file diff --git a/wooden-arig/info.json b/wooden-arig/info.json index 079d6ea..02c098d 100644 --- a/wooden-arig/info.json +++ b/wooden-arig/info.json @@ -2,12 +2,14 @@ "name": "wooden-arig", "version": "1.0.0", "title": "Wooden Arig", - "description": "", + "description": "Adds wood production to Arig.", "author": "cackling fiend", "homepage": "https://discord.gg/ufvFUJtVwk", "factorio_version": "2.0", "space_travel_required": true, "dependencies": [ - "planetaris-unbounded" + "cf-lib", + "planetaris-unbounded", + "(?) planet-muluna" ] } \ No newline at end of file diff --git a/wooden-arig/locale/en/en.cfg b/wooden-arig/locale/en/en.cfg index a6e947b..73f208f 100644 --- a/wooden-arig/locale/en/en.cfg +++ b/wooden-arig/locale/en/en.cfg @@ -1,2 +1,8 @@ [item-name] -cactus-tissue=Cactus tissue \ No newline at end of file +cactus-tissue=Cactus tissue + +[recipe-name] +cactus-tissue-processing=Cactus tissue processing +cactus-tissue-cultivation=Cactus tissue cultivation +cactus-tissue-dehydration=Cactus tissue dehydration +advanced-cactus-tissue-cultivation=Advanced cactus tissue cultivation diff --git a/wooden-arig/prototypes/compatibility/data.lua b/wooden-arig/prototypes/compatibility/data.lua new file mode 100644 index 0000000..fa526fe --- /dev/null +++ b/wooden-arig/prototypes/compatibility/data.lua @@ -0,0 +1 @@ +require("muluna") \ No newline at end of file diff --git a/wooden-arig/prototypes/compatibility/muluna.lua b/wooden-arig/prototypes/compatibility/muluna.lua new file mode 100644 index 0000000..bc59b14 --- /dev/null +++ b/wooden-arig/prototypes/compatibility/muluna.lua @@ -0,0 +1,55 @@ +local Technology = require("__cf-lib__/data/Technology") + +if not mods["planet-muluna"] then return end + +data:extend({ + { + type = "recipe", + name = "advanced-cactus-tissue-cultivation", + icons = { + { icon = "__wooden-arig__/graphics/icons/pile-dust-yellowcake-1.png" }, + { icon = "__planetaris-unbounded__/graphics/icons/fluid/pure-sand.png", scale = 0.25, shift = { 8, -8 }, draw_background = true }, + }, + subgroup = "arig-bioprocessing", + category = "muluna-greenhouse-11x11", + ingredients = { + { type = "item", name = "cactus-tissue", amount = 20 }, + { type = "fluid", name = "planetaris-pure-sand", amount = 4 }, + { type = "fluid", name = "steam", amount = 25 }, + }, + results = { { type = "item", name = "cactus-tissue", amount = 50 } }, + energy_required = 120, + enabled = false, + allow_productivity = false, + auto_recycle = false + }, + { + type = "recipe", + name = "muluna-greenhouse-arig", + localised_name = { "entity-name.muluna-greenhouse-wood" }, + category = "crafting", + icons = { + { icon = "__muluna-graphics__/graphics/greenhouse/sprites/greenhouse-icon.png" }, + { icon = "__planetaris-unbounded__/graphics/icons/glass-panel.png", scale = 0.25, shift = { 8, -8 }, draw_background = true } + }, + energy_required = 5, + enabled = false, + allow_productivity = false, + ingredients = + { + { type = "item", name = "steel-plate", amount = 10 }, + { type = "item", name = "planetaris-heavy-glass", amount = 20 }, + { type = "item", name = "small-lamp", amount = 20 }, + { type = "item", name = "pipe", amount = 10 }, + { type = "item", name = "chemical-plant", amount = 5 }, + { type = "item", name = "planetaris-sandstone-brick", amount = 20 }, + }, + results = { { type = "item", name = "muluna-greenhouse-wood", amount = 1 } } + } +}) + +Technology:new("planetaris-sand-sifting") + :addRecipe("advanced-cactus-tissue-cultivation") + :addRecipe("muluna-greenhouse-arig") + +data.raw.recipe["cactus-tissue-cultivation"].energy_required = 60 \ No newline at end of file diff --git a/wooden-arig/data-final-fixes.lua b/wooden-arig/prototypes/content/cactus.lua similarity index 91% rename from wooden-arig/data-final-fixes.lua rename to wooden-arig/prototypes/content/cactus.lua index 34cf2bc..2ff8690 100644 --- a/wooden-arig/data-final-fixes.lua +++ b/wooden-arig/prototypes/content/cactus.lua @@ -1,11 +1,11 @@ local space_age_item_sounds = require("__space-age__.prototypes.item_sounds") local cactus = table.deepcopy(data.raw["optimized-decorative"]["arig-small-cactus"]) -cactus.type = "simple-entity" +cactus.type = "tree" cactus.minable = { mining_time = 1, results = { - { type = "item", name = "cactus-tissue", amount_min = 1, amount_max = 5 } + { type = "item", name = "cactus-tissue", amount_min = 4, amount_max = 10 } } } cactus.localised_name = { "decorative-name.arig-small-cactus" } @@ -16,7 +16,7 @@ cactus.selection_box = { {-0.5, -0.5}, { 0.5, 0.5 } } cactus.mining_sound = sound_variations("__space-age__/sound/mining/mining-cuttlepop", 6, 0.8) cactus.mined_sound = sound_variations("__space-age__/sound/mining/mined-cuttlepop", 5, 0.7) cactus.flags = {"placeable-neutral", "placeable-off-grid"} -cactus.map_color = { 125, 149, 54 } +cactus.map_color = { 138, 138, 48 } cactus.icon = "__planetaris-unbounded__/graphics/decorative/arig-small-cactus/arig-cactus-9.png" data:extend({ diff --git a/wooden-arig/prototypes/content/data.lua b/wooden-arig/prototypes/content/data.lua new file mode 100644 index 0000000..b28ff84 --- /dev/null +++ b/wooden-arig/prototypes/content/data.lua @@ -0,0 +1,2 @@ +require("cactus") +require("tissue-processing") \ No newline at end of file diff --git a/wooden-arig/prototypes/content/tissue-processing.lua b/wooden-arig/prototypes/content/tissue-processing.lua new file mode 100644 index 0000000..6ea1783 --- /dev/null +++ b/wooden-arig/prototypes/content/tissue-processing.lua @@ -0,0 +1,64 @@ +local Technology = require("__cf-lib__/data/Technology") + +data:extend({ + { + type = "recipe", + name = "cactus-tissue-processing", + icons = { + { icon = "__base__/graphics/icons/wood.png" }, + { icon = "__wooden-arig__/graphics/icons/pile-dust-yellowcake-1.png", scale = 0.25, shift = { 8, 8 } } + }, + subgroup = "arig-bioprocessing", + category = "crafting", + ingredients = { { type = "item", name = "cactus-tissue", amount = 6 } }, + results = { { type = "item", name = "wood", amount = 1 } }, + energy_required = 4, + enabled = false, + allow_productivity = true, + auto_recycle = false + }, + { + type = "recipe", + name = "cactus-tissue-cultivation", + icons = { + { icon = "__wooden-arig__/graphics/icons/pile-dust-yellowcake-1.png" }, + }, + subgroup = "arig-bioprocessing", + category = "chemistry", + ingredients = { + { type = "item", name = "cactus-tissue", amount = 10 }, + { type = "fluid", name = "steam", amount = 10 }, + }, + results = { { type = "item", name = "cactus-tissue", amount = 20 } }, + energy_required = 6, + enabled = false, + allow_productivity = false, + auto_recycle = false + }, + { + type = "recipe", + name = "cactus-tissue-dehydration", + icons = { + { icon = "__base__/graphics/icons/wood.png" }, + { icon = "__wooden-arig__/graphics/icons/pile-dust-yellowcake-1.png", scale = 0.25, shift = { 8, 8 } } + }, + subgroup = "arig-bioprocessing", + category = "chemistry", + ingredients = { + { type = "item", name = "cactus-tissue", amount = 8 }, + }, + results = { + { type = "item", name = "wood", amount = 2 }, + { type = "fluid", name = "steam", amount = 6, ignored_by_productivity = 6 }, + }, + energy_required = 10, + enabled = false, + allow_productivity = true, + auto_recycle = false + }, +}) + +Technology:new("planet-discovery-arig") + :addRecipe("cactus-tissue-processing") + :addRecipe("cactus-tissue-cultivation") + :addRecipe("cactus-tissue-dehydration") \ No newline at end of file diff --git a/wooden-arig/thumbnail.png b/wooden-arig/thumbnail.png new file mode 100644 index 0000000..8688e74 Binary files /dev/null and b/wooden-arig/thumbnail.png differ