diff --git a/sources/thumbnail.afphoto b/sources/thumbnail.afphoto deleted file mode 100644 index 3bad747..0000000 Binary files a/sources/thumbnail.afphoto and /dev/null differ diff --git a/wooden-arig/prototypes/content/cactus.lua b/wooden-arig/data-final-fixes.lua similarity index 91% rename from wooden-arig/prototypes/content/cactus.lua rename to wooden-arig/data-final-fixes.lua index 2ff8690..34cf2bc 100644 --- a/wooden-arig/prototypes/content/cactus.lua +++ b/wooden-arig/data-final-fixes.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 = "tree" +cactus.type = "simple-entity" cactus.minable = { mining_time = 1, results = { - { type = "item", name = "cactus-tissue", amount_min = 4, amount_max = 10 } + { type = "item", name = "cactus-tissue", amount_min = 1, amount_max = 5 } } } 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 = { 138, 138, 48 } +cactus.map_color = { 125, 149, 54 } cactus.icon = "__planetaris-unbounded__/graphics/decorative/arig-small-cactus/arig-cactus-9.png" data:extend({ diff --git a/wooden-arig/data.lua b/wooden-arig/data.lua deleted file mode 100644 index a2b16aa..0000000 --- a/wooden-arig/data.lua +++ /dev/null @@ -1,2 +0,0 @@ -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 02c098d..079d6ea 100644 --- a/wooden-arig/info.json +++ b/wooden-arig/info.json @@ -2,14 +2,12 @@ "name": "wooden-arig", "version": "1.0.0", "title": "Wooden Arig", - "description": "Adds wood production to Arig.", + "description": "", "author": "cackling fiend", "homepage": "https://discord.gg/ufvFUJtVwk", "factorio_version": "2.0", "space_travel_required": true, "dependencies": [ - "cf-lib", - "planetaris-unbounded", - "(?) planet-muluna" + "planetaris-unbounded" ] } \ No newline at end of file diff --git a/wooden-arig/locale/en/en.cfg b/wooden-arig/locale/en/en.cfg index 73f208f..a6e947b 100644 --- a/wooden-arig/locale/en/en.cfg +++ b/wooden-arig/locale/en/en.cfg @@ -1,8 +1,2 @@ [item-name] -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 +cactus-tissue=Cactus tissue \ No newline at end of file diff --git a/wooden-arig/prototypes/compatibility/data.lua b/wooden-arig/prototypes/compatibility/data.lua deleted file mode 100644 index fa526fe..0000000 --- a/wooden-arig/prototypes/compatibility/data.lua +++ /dev/null @@ -1 +0,0 @@ -require("muluna") \ No newline at end of file diff --git a/wooden-arig/prototypes/compatibility/muluna.lua b/wooden-arig/prototypes/compatibility/muluna.lua deleted file mode 100644 index bc59b14..0000000 --- a/wooden-arig/prototypes/compatibility/muluna.lua +++ /dev/null @@ -1,55 +0,0 @@ -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/prototypes/content/data.lua b/wooden-arig/prototypes/content/data.lua deleted file mode 100644 index b28ff84..0000000 --- a/wooden-arig/prototypes/content/data.lua +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 6ea1783..0000000 --- a/wooden-arig/prototypes/content/tissue-processing.lua +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 8688e74..0000000 Binary files a/wooden-arig/thumbnail.png and /dev/null differ