Initial commit

Author: 0n0w1c

.gitignore

@@ -1,3 +1,4 @@
 .vim
 .vscode
 .nvimrc
+.DS_Store

data-updates.lua

@@ -8,15 +8,7 @@ if mods['bobplates'] then
     --data.raw['technology']['plutonium-processing'].effects = {} -- Broken. Why did I do this in the first place?
 end
 
-if mods['IndustrialRevolution'] then
-    data.raw['ammo']['plutonium-rounds-magazine'].subgroup = 'ir2-ammo'
-    data.raw['item']['plutonium-238'].subgroup = 'pure'
-    data.raw['item']['plutonium-239'].subgroup = 'pure'
-    data.raw['item']['plutonium-fuel'].subgroup = 'ir2-fuels'
-    data.raw['item']['MOX-fuel'].order = 'ib'
-    data.raw['item']['plutonium-fuel'].order = 'fb'
-    data.raw['item']['used-up-MOX-fuel'].order = 'r[used-up-uranium-fuel-cell]-b'
-
+if mods['IndustrialRevolution3'] then
     if data.raw['technology']['plutonium-ammo'] then
         data.raw['technology']['plutonium-ammo'].unit.count = 2000
         data.raw['technology']['plutonium-ammo'].unit.time = 60
@@ -26,6 +18,51 @@ if mods['IndustrialRevolution'] then
         -- Note to future self: atomic bombs are replaced by artillery shells in IR2
         data.raw['technology']['plutonium-atomic-bomb'].effects = {{type='unlock-recipe', recipe='plutonium-atomic-artillery-shell'}}
     end
+
+    -- IR3 removes uranium-fuel, not a usable fuel for vehicles
+    data.raw['recipe']['plutonium-fuel'].hidden = true
+    data.raw['recipe']['plutonium-fuel'].enabled = false
+
+    for index, effect in pairs(data.raw['technology']['plutonium-enrichment-process'].effects) do
+        if effect.recipe == "plutonium-fuel" then
+            table.remove(data.raw['technology']['plutonium-enrichment-process'].effects, index)
+        end
+    end       
+
+    -- IR3 uses barreling machines
+    for index, effect in pairs(data.raw['technology']['plutonium-processing'].effects) do
+        if effect.recipe == "advanced-nuclear-fuel-reprocessing-with-barrelling" then
+            table.remove(data.raw['technology']['plutonium-processing'].effects, index)
+        end
+    end
+
+    -- assign IR3 subgroups
+    data.raw['recipe']['MOX-reactor'].subgroup = "ir-nuclear-machines"
+    data.raw['recipe']['MOX-reactor'].order = "f[nuclear-energy]-a[reactor]"
+
+    data.raw['item']['MOX-reactor'].subgroup = "ir-nuclear-machines"
+    data.raw['item']['MOX-reactor'].order = "f[nuclear-energy]-a[reactor]"
+
+    data.raw['recipe']['breeder-reactor'].subgroup = "ir-nuclear-machines"
+    data.raw['recipe']['breeder-reactor'].order = "f[nuclear-energy]-a[reactor]"
+
+    data.raw['item']['breeder-reactor'].subgroup = "ir-nuclear-machines"
+    data.raw['item']['breeder-reactor'].order = "f[nuclear-energy]-a[reactor]"
+
+    data.raw['recipe']['MOX-fuel'].subgroup = "intermediate-product"
+    data.raw['recipe']['MOX-fuel'].order = "r[uranium-processing]-e[MOX-fuel-processing]"
+
+    data.raw['item']['MOX-fuel'].subgroup = "intermediate-product"
+    data.raw['item']['MOX-fuel'].order = "r[uranium-processing]-e[MOX-fuel-processing]"
+
+    data.raw['item']['used-up-MOX-fuel'].subgroup = "intermediate-product"
+    data.raw['item']['used-up-MOX-fuel'].order = 'r[used-up-uranium-fuel-cell]-b'
+
+    data.raw['recipe']['plutonium-rounds-magazine'].subgroup = 'ir-ammo'
+    data.raw['recipe']['plutonium-rounds-magazine'].order = 'c-q'
+
+    data.raw['ammo']['plutonium-rounds-magazine'].subgroup = 'ir-ammo'
+    data.raw['ammo']['plutonium-rounds-magazine'].order = 'c-q'
 end
 
 if mods['SchallRadioactiveWaste'] then

prototypes/entity/projectiles.lua

@@ -254,7 +254,7 @@ if mods['bobwarfare'] then
     plutonium_atomic_artillery_projectile.action.action_delivery.target_effects[13].action.radius = 50
     table.insert(projectiles, plutonium_atomic_artillery_projectile)
 
-elseif mods['IndustrialRevolution'] then
+elseif mods['IndustrialRevoluton3'] then
     local plutonium_atomic_artillery_projectile = util.table.deepcopy(data.raw['artillery-projectile']['atomic-artillery-projectile'])
 
     plutonium_atomic_artillery_projectile.name = 'plutonium-atomic-artillery-projectile'

prototypes/recipe/ammo.lua

@@ -57,7 +57,7 @@ end
 if ammo_recipes[1] then data:extend(ammo_recipes) end
 
 if settings.startup['enable-plutonium-ammo'].value then
-    if mods["IndustrialRevolution"] then
+    if mods["IndustrialRevolution3"] then
         --adds lead plates to the ammo recipes
         data:extend({
                 {
@@ -66,7 +66,7 @@ if settings.startup['enable-plutonium-ammo'].value then
                     enabled = false,
                     energy_required = 10,
                     ingredients = {
-                        {"piercing-rounds-magazine", 1},
+                        {"chromium-magazine", 1},
                         {"lead-plate", 2},
                         {"plutonium-238", 1}
                     },
@@ -96,7 +96,7 @@ if settings.startup['enable-plutonium-ammo'].value then
                     },
                     result = "explosive-plutonium-cannon-shell"
                 },
-                -- makes an atomic artillery shell, IR2's replacement for an atomic bomb
+                -- makes an atomic artillery shell, IR3's replacement for an atomic bomb
                 {
                     type = "recipe",
                     name = "plutonium-atomic-artillery-shell",

prototypes/recipe/recipes.lua

@@ -287,15 +287,8 @@ data:extend({
     }
 })
 
-if mods["IndustrialRevolution"] then
-    -- Recipe tweaks
-    data.raw['recipe']['plutonium-fuel'].ingredients = {
-        { "rocket-fuel",   1 },
-        { "plutonium-239", 1 }
-    }
-    data.raw['recipe']['plutonium-fuel'].energy_required = 90
-    data.raw['recipe']['plutonium-fuel'].category = 'chemistry'
-    -- Add Shielded Steel plate to recipes
+if mods["IndustrialRevolution3"] then
+    -- Add radation shielding to recipes
     data.raw['recipe']['MOX-fuel'].ingredients = {
         { "lead-plate-special", 10 },
         { "uranium-238",        19 },
@@ -357,13 +350,4 @@ if mods["IndustrialRevolution"] then
     }
     table.insert(data.raw['recipe']['advanced-nuclear-fuel-reprocessing'].results, { name = "steel-scrap", amount = 1 })
     table.insert(data.raw['recipe']['advanced-nuclear-fuel-reprocessing'].results, { name = "lead-scrap", amount = 1 })
-    table.insert(data.raw['recipe']['advanced-nuclear-fuel-reprocessing-with-barrelling'].results,
-        { name = "steel-scrap", amount = 1 })
-    table.insert(data.raw['recipe']['advanced-nuclear-fuel-reprocessing-with-barrelling'].results,
-        { name = "lead-scrap", amount = 1 })
-    -- Subgroup and ordering fixes
-    data.raw['recipe']['MOX-fuel-reprocessing'].subgroup = 'ir2-fuels'
-    data.raw['recipe']['plutonium-enrichment-process'].subgroup = 'ir2-fuels'
-    data.raw['recipe']['MOX-fuel'].subgroup = 'ir2-fuels'
-    data.raw['recipe']['MOX-fuel'].category = 'centrifuging'
 end