diff --git a/README.md b/README.md index bd81bd3..50ffb32 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,24 @@ -More Uranium-235 (original by NancyBDrew) - This mod makes it easier to get Uranium-235 by greatly increasing the ratio of U235 to U238 produced by uranium processing. - - This helps you bypass Kovarex enrichment, though as a downside you won't have as much U238. - -This mod sets the ratio to 5% U235 95% U238. - -## Versions - * 0.0.5 - adding 2 more recipes. One for recyceling and one for enrichment. - * 0.0.4 - complete rewrite for 2.0 with some recycle functions - * 0.0.3 05/95 produce - * 0.0.2 50/50 produce - * 0.0.1 Initial release - -## Infos - -#### 0.0.5 -The icons I used are AI generated cause I would say I'm unable to create something of my own. I'm really really sorry for that. - -## License - -MIT license +More Uranium-235 + This mod makes it easier to get Uranium-235 by greatly increasing the ratio of U235 to U238 produced by uranium processing. + + This helps you bypass Kovarex enrichment, though as a downside you won't have as much U238. + +This mod sets the ratio to 5% U235 95% U238. + +## Versions + * 0.0.6 - messed up with the version number + * 0.0.5 - adding 2 more recipes. One for recyceling and one for enrichment. + * 0.0.4 - complete rewrite for 2.0 with some recycle functions + * 0.0.1 - 0.0.3 (original by NancyBDrew) + * 0.0.3 05/95 produce + * 0.0.2 50/50 produce + * 0.0.1 Initial release + +## Infos + +#### 0.0.5 +The icons I used are AI generated cause I would say I'm unable to create something of my own. I'm really really sorry for that. + +## License + +MIT license diff --git a/pack.ps1 b/pack.ps1 index 3489d5d..7c52c2e 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -1,19 +1,31 @@ -# -# -# -# -Write-Host "PACK MOD" -$code = Get-Content .\src\info.json -Raw | ConvertFrom-Json - -$name = $code.name + "_" + $code.version -Write-Host ("Packing as $name") - -rm tmp -r -force -mkdir tmp -cp -r src tmp -cp README.md tmp/src -mv "tmp/src" "tmp/$name" -cd tmp -Compress-Archive "./$name" "../dist/$name.zip" -cd .. +# +# +# +# + +New-Item -ItemType Directory -Force -Path dist + +$7zipPath = "$env:ProgramFiles\7-Zip\7z.exe" + +if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { + throw "7 zip executable '$7zipPath' not found" +} + +Set-Alias Start-SevenZip $7zipPath + +Write-Host "PACK MOD" + +$code = Get-Content .\src\info.json -Raw | ConvertFrom-Json + +$name = $code.name + "_" + $code.version +Write-Host ("Packing as $name") + +rm tmp -r -force +mkdir tmp +cp -r src tmp +cp README.md tmp/src +mv "tmp/src" "tmp/$name" +cd tmp +Start-SevenZip a -tzip "../dist/$name.zip" "./$name" +cd .. rm tmp -r -force \ No newline at end of file diff --git a/src/data.lua b/src/data.lua index ee5bc54..264213f 100644 --- a/src/data.lua +++ b/src/data.lua @@ -1,2 +1,2 @@ -require("prototypes.recipe") +require("prototypes.recipe") require("prototypes.technology") \ No newline at end of file diff --git a/src/info.json b/src/info.json index e79e0cd..1b0bef0 100644 --- a/src/info.json +++ b/src/info.json @@ -1,9 +1,9 @@ -{ - "name": "more-u235_50_50", - "version": "0.0.5", - "factorio_version": "2.0", - "title": "More Uranium-235 05/95", - "author": "Theenoro", - "description": "original by Eric Stansifer, Increases ratio of U235 to U238 produced by uranium processing", - "dependencies": ["base"] -} +{ + "name": "more-u235_50_50", + "version": "0.0.6", + "factorio_version": "2.0", + "title": "More Uranium-235 05/95", + "author": "Theenoro", + "description": "original by Eric Stansifer, Increases ratio of U235 to U238 produced by uranium processing", + "dependencies": ["base"] +} diff --git a/src/locale/en/locale.cfg b/src/locale/en/locale.cfg index 7d4f9bb..f823e7b 100644 --- a/src/locale/en/locale.cfg +++ b/src/locale/en/locale.cfg @@ -1,13 +1,13 @@ -[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 +[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/src/prototypes/recipe.lua b/src/prototypes/recipe.lua index 15f7184..1d8031e 100644 --- a/src/prototypes/recipe.lua +++ b/src/prototypes/recipe.lua @@ -1,58 +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, - 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} - }, - } +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/src/prototypes/technology.lua b/src/prototypes/technology.lua index 411f71c..3911350 100644 --- a/src/prototypes/technology.lua +++ b/src/prototypes/technology.lua @@ -1,56 +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" - },{ - 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, - } - }, +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