From 99336d0d620b0e1751d5a04e4d2d6a0f6cb30bec Mon Sep 17 00:00:00 2001 From: Theenoro Date: Sat, 2 Nov 2024 00:32:34 +0100 Subject: [PATCH] 0.0.5 - added build, packed some stuff.. --- .gitignore | 2 + .vscode/settings.json | 5 + pack.bat | 8 ++ data.lua => src/data.lua | 0 {graphics => src/graphics}/Thumbs.db | Bin {graphics => src/graphics}/processing.png | Bin {graphics => src/graphics}/recycle_ico.png | Bin info.json => src/info.json | 0 {locale => src/locale}/en/locale.cfg | 24 ++-- {prototypes => src/prototypes}/recipe.lua | 111 +++++++++--------- {prototypes => src/prototypes}/technology.lua | 107 +++++++++-------- thumbnail.png => src/thumbnail.png | Bin 12 files changed, 140 insertions(+), 117 deletions(-) create mode 100644 .gitignore create mode 100644 .vscode/settings.json create mode 100644 pack.bat rename data.lua => src/data.lua (100%) rename {graphics => src/graphics}/Thumbs.db (100%) rename {graphics => src/graphics}/processing.png (100%) rename {graphics => src/graphics}/recycle_ico.png (100%) rename info.json => src/info.json (100%) rename {locale => src/locale}/en/locale.cfg (88%) rename {prototypes => src/prototypes}/recipe.lua (93%) rename {prototypes => src/prototypes}/technology.lua (92%) rename thumbnail.png => src/thumbnail.png (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..50350be --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +dist +tmp \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c119e6f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "Lua.diagnostics.globals": [ + "data" + ] +} \ No newline at end of file diff --git a/pack.bat b/pack.bat new file mode 100644 index 0000000..337f3b9 --- /dev/null +++ b/pack.bat @@ -0,0 +1,8 @@ +powershell rm tmp -r -force +powershell mkdir tmp +powershell cp -r src tmp +powershell mv tmp/src tmp/more-u235_extended +cd tmp +powershell Compress-Archive ./more-u235_extended ../dist/more-u235_extended.zip +cd .. +powershell rm tmp -r -force \ No newline at end of file diff --git a/data.lua b/src/data.lua similarity index 100% rename from data.lua rename to src/data.lua diff --git a/graphics/Thumbs.db b/src/graphics/Thumbs.db similarity index 100% rename from graphics/Thumbs.db rename to src/graphics/Thumbs.db diff --git a/graphics/processing.png b/src/graphics/processing.png similarity index 100% rename from graphics/processing.png rename to src/graphics/processing.png diff --git a/graphics/recycle_ico.png b/src/graphics/recycle_ico.png similarity index 100% rename from graphics/recycle_ico.png rename to src/graphics/recycle_ico.png diff --git a/info.json b/src/info.json similarity index 100% rename from info.json rename to src/info.json diff --git a/locale/en/locale.cfg b/src/locale/en/locale.cfg similarity index 88% rename from locale/en/locale.cfg rename to src/locale/en/locale.cfg index 57c2b14..7d4f9bb 100644 --- a/locale/en/locale.cfg +++ b/src/locale/en/locale.cfg @@ -1,11 +1,13 @@ -[recipe-name] -mu-u235_1_20=Uran 235 1/20 -mu-dufc=Recycle depleted uran fuel cell - -[technology-name] -mu-u235=Uran 235 1/20 centrifuging -mu-dufc=Recycle depleted uran fuel cell - -[technology-description] -mu-u235=A perfect way to get the exact amount of Uran235 and Uran238 -mu-dufc=Recycle depleted uran fuel cell +[recipe-name] +mu-u235_1_20=Uran 235 1/20 +mu-dufc=Recycle depleted uran fuel cell +mu-uer=Uranium enrichment + +[technology-name] +mu-u235=Uran 235 1/20 centrifuging +mu-dufc=Recycle depleted uran fuel cell + +[technology-description] +mu-u235=A perfect way to get the exact amount of Uran235 and Uran238 +mu-dufc=Recycle depleted uran fuel cell +mu-uer=@TODO diff --git a/prototypes/recipe.lua b/src/prototypes/recipe.lua similarity index 93% rename from prototypes/recipe.lua rename to src/prototypes/recipe.lua index 6d0d174..15f7184 100644 --- a/prototypes/recipe.lua +++ b/src/prototypes/recipe.lua @@ -1,55 +1,58 @@ -data:extend({ - - { - type = "recipe", - name = "mu-u235_1_20", - category = "centrifuging", - icon = "__more-u235_50_50__/graphics/processing.png", - icon_size = 128, - enabled = false, - energy_required = 30, - ingredients = - { - {type = "item", name = "uranium-ore", amount = 20}, - }, - results = - { - {type = "item", name = "uranium-235", amount = 1}, - {type = "item", name = "uranium-238", amount = 19}, - }, - },{ - type = "recipe", - name = "mu-dufc", - category = "centrifuging", - icon = "__more-u235_50_50__/graphics/recycle_ico.png", - icon_size = 128, - enabled = false, - energy_required = 30, - ingredients = - { - {type = "item", name = "depleted-uranium-fuel-cell", amount = 10}, - }, - results = - { - {type = "item", name = "uranium-238", amount = 10}, - }, - },{ - type = "recipe", - name = "mu-dufc", - category = "centrifuging", - icon = "__more-u235_50_50__/graphics/recycle_ico.png", - icon_size = 128, - enabled = false, - energy_required = 30, - ingredients = - { - {type = "item", name = "uranium-235", amount = 1}, - {type = "item", name = "uranium-238", amount = 59}, - }, - results = - { - {type = "item", name = "uranium-238", amount = 38}, - {type = "item", name = "uranium-235", amount = 2} - }, - } +data:extend({ + + { + type = "recipe", + name = "mu-u235_1_20", + category = "centrifuging", + icon = "__more-u235_50_50__/graphics/processing.png", + icon_size = 128, + enabled = false, + energy_required = 30, + subgroup = "energy", + ingredients = + { + {type = "item", name = "uranium-ore", amount = 20}, + }, + results = + { + {type = "item", name = "uranium-235", amount = 1}, + {type = "item", name = "uranium-238", amount = 19}, + }, + },{ + type = "recipe", + name = "mu-dufc", + category = "centrifuging", + icon = "__more-u235_50_50__/graphics/recycle_ico.png", + icon_size = 128, + enabled = false, + energy_required = 30, + subgroup = "energy", + ingredients = + { + {type = "item", name = "depleted-uranium-fuel-cell", amount = 10}, + }, + results = + { + {type = "item", name = "uranium-238", amount = 10}, + }, + },{ + type = "recipe", + name = "mu-uer", + category = "centrifuging", + subgroup = "energy", + icon = "__more-u235_50_50__/graphics/recycle_ico.png", + icon_size = 128, + enabled = false, + energy_required = 30, + ingredients = + { + {type = "item", name = "uranium-235", amount = 1}, + {type = "item", name = "uranium-238", amount = 59}, + }, + results = + { + {type = "item", name = "uranium-238", amount = 38}, + {type = "item", name = "uranium-235", amount = 2} + }, + } }) \ No newline at end of file diff --git a/prototypes/technology.lua b/src/prototypes/technology.lua similarity index 92% rename from prototypes/technology.lua rename to src/prototypes/technology.lua index b263cbd..411f71c 100644 --- a/prototypes/technology.lua +++ b/src/prototypes/technology.lua @@ -1,53 +1,56 @@ -data:extend({ - { - type = "technology", - name = "mu-u235", - icon_size = 256, - icon = "__more-u235_50_50__/graphics/processing.png", - effects = - { - { - type = "unlock-recipe", - recipe = "mu-u235_1_20" - }, - }, - prerequisites = {"uranium-processing"}, - unit = - { - count = 200, - ingredients = - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"production-science-pack", 1} - }, - time = 40, - } - },{ - type = "technology", - name = "mu-dufc", - icon_size = 128, - icon = "__more-u235_50_50__/graphics/recycle_ico.png", - effects = - { - { - type = "unlock-recipe", - recipe = "mu-dufc" - }, - }, - prerequisites = {"nuclear-fuel-reprocessing"}, - unit = - { - count = 50, - ingredients = - { - {"automation-science-pack", 1}, - {"logistic-science-pack", 1}, - {"chemical-science-pack", 1}, - {"production-science-pack", 1} - }, - time = 40, - } - }, +data:extend({ + { + type = "technology", + name = "mu-u235", + icon_size = 256, + icon = "__more-u235_50_50__/graphics/processing.png", + effects = + { + { + type = "unlock-recipe", + recipe = "mu-u235_1_20" + }, + }, + prerequisites = {"uranium-processing"}, + unit = + { + count = 200, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1} + }, + time = 40, + } + },{ + type = "technology", + name = "mu-dufc", + icon_size = 128, + icon = "__more-u235_50_50__/graphics/recycle_ico.png", + effects = + { + { + type = "unlock-recipe", + recipe = "mu-dufc" + },{ + type = "unlock-recipe", + recipe = "mu-uer" + } + }, + prerequisites = {"nuclear-fuel-reprocessing"}, + unit = + { + count = 50, + ingredients = + { + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, + {"production-science-pack", 1} + }, + time = 40, + } + }, }) \ No newline at end of file diff --git a/thumbnail.png b/src/thumbnail.png similarity index 100% rename from thumbnail.png rename to src/thumbnail.png