CuW

changelog.txt

@@ -1,8 +1,9 @@
 ---------------------------------------------------------------------------------------------------
-Version: 0.6.7
+Version: 0.7.0
 Date: 2022-08-09
+  Features:
+    - New optional intermediate: CuW composite. Replaces tungsten plate in some recipes.
   Changes:
-    - Support advanced optional settings
 ---------------------------------------------------------------------------------------------------
 Version: 0.6.6
 Date: 2021-08-02

info.json

@@ -1,6 +1,6 @@
 { 
     "name": "bztungsten",
-    "version": "0.6.7",
+    "version": "0.7.0",
     "factorio_version": "1.1",
     "title": "Tungsten",
     "author": "Brevven",
@@ -12,6 +12,7 @@
       "? Krastorio2",
       "? deadlock-beltboxes-loaders",
       "? DeadlockCrating",
+      "? bztitanium",
       "? bzlead"
     ],
     "description": "Adds tungsten ore (wolframite), tungsten plates, tungsten carbide and rocket engine nozzles to the base game.\n\nCompatible with RSO, Space Exploration, Krastorio 2, and several other mods. A standalone piece of BZ Mods."

locale/en/tungsten.cfg

@@ -21,6 +21,7 @@ enriched-tungsten=Enriched tungsten
 tungsten-chest=Tungsten chest
 compressed-tungsten-ore=Compressed tungsten ore
 advanced-carbon-furnace=Advanced carbon furnace
+cuw=CuW composite
 
 [item-description]
 tungsten-ore=Can be smelted into tungsten plates
@@ -60,6 +61,7 @@ bztungsten-advanced-carbon-furnace=Enable the advanced carbon furnace
 bztungsten-mining-fluid-amount=Mining fluid amount
 bztungsten-mining-fluid-amount-k2=Mining fluid amount for Krastorio2
 bztungsten-starting-patch=Starting wolframite patch
+bztungsten-more-intermediates=Enable more intermediates
 
 [mod-setting-description]
 bztungsten-recipe-bypass=Skip modifying these recipes (comma-separated list).
@@ -68,3 +70,7 @@ bztungsten-advanced-carbon-furnace=A furnace to smelt tungsten carbide quickly.
 bztungsten-mining-fluid-amount=Amount of fluid (water) needed to mine, default 10. Note, this is displayed as 1/10th the value in some parts of the game.
 bztungsten-mining-fluid-amount-k2=Mining fluid amount for Krastorio2, default 1. Note, this is displayed as 1/10th the value in some parts of the game.
 bztungsten-starting-patch=Whether a new game should have a starting wolframite patch. Disabled by default in vanilla, AAI, etc. 
+
+[string-mod-setting]
+bztungsten-more-intermediates-no=No
+bztungsten-more-intermediates-cuw=Yes: __ITEM__cuw__

me.lua

@@ -11,6 +11,12 @@ if mods.bobplates then
   me.tungsten_carbide_recipe = "bz-tungsten-carbide"
 end
 
+function me.cuw()
+  if me.get_setting("bz-all-intermediates") then return true end
+  return me.get_setting("bztungsten-more-intermediates") == "cuw"
+end
+
+
 function me.starting_patch()
   return mods["Krastorio2"] or me.get_setting("bztungsten-starting-patch")
 end

settings.lua

@@ -6,6 +6,13 @@ data:extend({
 		default_value = "",
     allow_blank = true,
 	},
+  {
+		type = "string-setting",
+		name = "bztungsten-more-intermediates",
+		setting_type = "startup",
+		default_value = "no",
+    allowed_values = {"cuw", "no"},
+	},
   {
 		type = "string-setting",
 		name = "bztungsten-avoid-military",

tungsten-recipe-final-stacking.lua

@@ -13,6 +13,9 @@ if deadlock then
   if data.raw.item["tungsten-ingot"] then
     deadlock.add_stack("tungsten-ingot", nil, "deadlock-stacking-2", nil)
   end
+  if util.me.cuw() then
+    deadlock.add_stack("cuw", "__bztungsten__/graphics/icons/stacked/cuw-stacked.png" , "deadlock-stacking-2", 128)
+  end
 end
 
 -- Deadlock crating recipes
@@ -27,5 +30,8 @@ if deadlock_crating then
   if data.raw.item["tungsten-ingot"] then
     deadlock_crating.add_crate("tungsten-ingot", "deadlock-crating-2")
   end
+  if util.me.cuw() then
+    deadlock_crating.add_crate("cuw", "deadlock-crating-2")
+  end
 end
 

tungsten-recipe-se.lua

@@ -5,6 +5,9 @@ if mods["space-exploration"] then
   se_delivery_cannon_recipes["tungsten-ore"] = {name= "tungsten-ore"}
   se_delivery_cannon_recipes["tungsten-plate"] = {name= "tungsten-plate"}
   se_delivery_cannon_recipes["tungsten-carbide"] = {name= "tungsten-carbide"}
+  if util.me.cuw() then
+    se_delivery_cannon_recipes["cuw"] = {name= "cuw"}
+  end
 
   data:extend({
   {
@@ -22,7 +25,7 @@ if mods["space-exploration"] then
   }
   })
 
-if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
+if string.sub(mods["space-exploration"], 1, 3) >= "0.6" then
   data:extend({
   {
     type = "item-subgroup",
@@ -33,6 +36,7 @@ if string.sub(mods["space-exploration"], 1, 3) == "0.6" then
   })
   util.set_item_subgroup("tungsten-plate", "tungsten")
   util.set_item_subgroup("tungsten-carbide", "tungsten")
+  util.set_item_subgroup("cuw", "tungsten")
   data:extend({
   {
     type = "item",

tungsten-recipe-updates.lua

@@ -1,5 +1,8 @@
 local util = require("__bztungsten__.data-util");
 
+local cuw = "tungsten-plate"
+if util.me.cuw() then cuw = "cuw" end
+
 -- Lamps
 util.add_prerequisite("optics", util.me.tungsten_processing)
 util.set_tech_recipe("optics", {{"automation-science-pack", 1}, {"logistic-science-pack", 1}})
@@ -25,21 +28,24 @@ util.add_ingredient("chemical-plant", "tungsten-carbide", 2)
 util.add_ingredient("electric-furnace", "tungsten-carbide", 1)
 
 -- Electrodes & spark plugs
-util.replace_ingredient("accumulator", "iron-plate", "tungsten-plate")
+util.replace_ingredient("accumulator", "iron-plate", cuw)
-util.add_ingredient("oil-refinery", "tungsten-plate", 1)
+util.add_ingredient("oil-refinery", cuw, 10)
-util.add_ingredient("chemical-plant", "tungsten-plate", 1)
+util.add_ingredient("chemical-plant", cuw, 5)
 util.add_prerequisite("engine", util.me.tungsten_processing)
 util.add_ingredient("engine-unit", "tungsten-plate", 1)
 
 
 -- Hot stuff
 util.add_prerequisite("advanced-materials-processing-2", util.me.tungsten_processing)
-util.replace_some_ingredient("electric-furnace", "steel-plate", 5, "tungsten-plate", 5)
+util.replace_some_ingredient("electric-furnace", "steel-plate", 5, cuw, 5)
-util.replace_some_ingredient("heat-exchanger", "copper-plate", 50, "tungsten-plate", 50)
+util.replace_some_ingredient("heat-exchanger", "copper-plate", 50, cuw, 50)
-util.replace_some_ingredient("heat-pipe", "copper-plate", 10, "tungsten-plate", 10)
+if not util.me.cuw() then
-util.add_ingredient("nuclear-reactor", "tungsten-plate", 500)
+  -- keep old behvaior
-util.add_ingredient("flamethrower-turret", "tungsten-plate", 5)
+  util.replace_some_ingredient("heat-pipe", "copper-plate", 10, "tungsten-plate", 10)
-util.add_ingredient("flamethrower", "tungsten-plate", 2)
+end
+util.add_ingredient("nuclear-reactor", cuw, 500)
+util.add_ingredient("flamethrower-turret", cuw, 5)
+util.add_ingredient("flamethrower", cuw, 2)
 util.add_ingredient("nuclear-fuel", "tungsten-plate", 1)
 
 -- Rocket engine nozzle techs
@@ -64,7 +70,7 @@ util.add_ingredient("atomic-bomb-pu", "tungsten-plate", 1)
 -- Plutonium Energy
 util.add_ingredient("plutonium-atomic-bomb", "rocket-engine-nozzle", 7)
 util.add_ingredient("plutonium-atomic-bomb", "tungsten-plate", 1)
-util.add_ingredient("MOX-reactor", "tungsten-plate", 400)
+util.add_ingredient("MOX-reactor", cuw, 400)
 
 -- Airplanes
 util.add_prerequisite("afterburner", "rocketry")
@@ -106,9 +112,9 @@ if mods["Krastorio2"] then
   util.replace_ingredient("kr-filtration-plant", "engine-unit", "pipe")
 
   -- Heat related
-  util.add_ingredient("kr-fusion-reactor", "tungsten-plate", 350)
+  util.add_ingredient("kr-fusion-reactor", cuw, 350)
-  util.add_ingredient("energy-control-unit", "tungsten-plate", 3)
+  util.add_ingredient("energy-control-unit", cuw, 3)
-  util.replace_some_ingredient("kr-advanced-furnace", "rare-metals", 40, "tungsten-plate", 40)
+  util.replace_some_ingredient("kr-advanced-furnace", "rare-metals", 40, cuw, 40)
 
   -- Other
   if mods.bzzirconium then
@@ -138,12 +144,12 @@ end
 -- SE
 if mods["space-exploration"] then
   -- Heat Shielding
-  util.replace_some_ingredient("se-heat-shielding", "steel-plate", 1, "tungsten-plate", 3)
+  util.replace_some_ingredient("se-heat-shielding", "steel-plate", 1, cuw, 3)
-  util.replace_some_ingredient("se-heat-shielding-iridium", "stone-tablet", 3, "tungsten-plate", 3)
+  util.replace_some_ingredient("se-heat-shielding-iridium", "stone-tablet", 3, cuw, 3)
 
   -- Hot stuff
   util.add_ingredient("se-space-electromagnetics-laboratory", "tungsten-plate", 20)
-  util.add_ingredient("se-space-radiator", "tungsten-plate", 4)
+  util.add_ingredient("se-space-radiator", cuw, 4)
   util.add_ingredient("se-delivery-cannon-weapon-capsule", "tungsten-plate", 10)
 
   -- Data
@@ -153,11 +159,11 @@ if mods["space-exploration"] then
     util.add_ingredient("se-hot-thermodynamics-data", "zirconium-tungstate", 1)
     util.add_product("se-hot-thermodynamics-data", {name="zirconium-tungstate", amount=1, probability=0.50})
   else
-    util.add_ingredient("se-hot-thermodynamics-data", "tungsten-plate", 1)
+    util.add_ingredient("se-hot-thermodynamics-data", cuw, 1)
-    util.add_product("se-hot-thermodynamics-data", {name="tungsten-plate", amount=1, probability=0.50})
+    util.add_product("se-hot-thermodynamics-data", {name= cuw, amount=1, probability=0.50})
   end
-  util.add_ingredient("se-particle-beam-shielding-data", "tungsten-plate", 1)
+  util.add_ingredient("se-particle-beam-shielding-data", cuw, 1)
-  util.add_product("se-particle-beam-shielding-data", {name="tungsten-plate", amount=1, probability=0.20})
+  util.add_product("se-particle-beam-shielding-data", {name= cuw, amount=1, probability=0.20})
 
   --rocket
   util.add_ingredient("se-rocket-science-pack", "rocket-engine-nozzle", 1)
@@ -186,10 +192,10 @@ util.add_ingredient("vehicle-flame-tumbler", "flamethrower", 1)
 
 
 
-util.replace_some_ingredient("superheater", "copper-plate", 10, "tungsten-plate", 10)
+util.replace_some_ingredient("superheater", "copper-plate", 10, cuw, 10)
 
 -- Expanded rocket payloads
-util.add_ingredient("radioisotope-thermoelectric-generater", "tungsten-plate", 100)
+util.add_ingredient("radioisotope-thermoelectric-generater", cuw, 100)
 util.add_ingredient("satellite-thruster", "rocket-engine-nozzle", 12)
 
   
@@ -235,7 +241,7 @@ util.replace_some_ingredient("kj_40kdreadnought", "steel-plate", 25, "tungsten-p
 util.replace_some_ingredient("kj_40klemanruss", "steel-plate", 25, "tungsten-plate", 25)
 
 -- additional turrets
-util.add_ingredient("at-acidthrower-turret", "tungsten-plate", 5)
+util.add_ingredient("at-acidthrower-turret", cuw, 5)
 util.replace_some_ingredient("small-cannon-shell", "steel-plate", 2, "tungsten-plate", 2)
 util.add_ingredient("small-rocket","rocket-engine-nozzle", 1)
 util.add_ingredient("Artillery_mk1_Ammo", "tungsten-plate", 2)
@@ -306,16 +312,16 @@ util.add_ingredient("quarry-mk3", "tungsten-carbide", 20)
 
 
 -- Geothermal
-util.replace_some_ingredient("geothermal-heat-exchanger", "copper-plate", 120, "tungsten-plate", 120)
+util.replace_some_ingredient("geothermal-heat-exchanger", "copper-plate", 120, cuw, 120)
 
 -- FastFurnaces
 util.replace_some_ingredient("reika-fast-electric-mining-drill", "steel-plate", 10, "tungsten-carbide", 10)
 
 -- Nuclear furnaces
-util.add_ingredient("nuclear-furnace-3", "tungsten-plate", 200)
+util.add_ingredient("nuclear-furnace-3", cuw, 200)
 
 -- Mega Furnace
-util.add_ingredient("mega-furnace", "tungsten-plate", 5)
+util.add_ingredient("mega-furnace", cuw, 5)
 
 -- Mundas
 util.add_ingredient("munda_big_machine", "tungsten-carbide", 32)
@@ -323,8 +329,8 @@ util.add_prerequisite("munda_big_machine", util.me.tungsten_processing)
 
 
 -- Realistic reactors
-util.add_ingredient("realistic-reactor", "tungsten-plate", 500)
+util.add_ingredient("realistic-reactor", cuw, 500)
-util.add_ingredient("breeder-reactor", "tungsten-plate", 500)
+util.add_ingredient("breeder-reactor", cuw, 500)
 
 
 
@@ -373,18 +379,21 @@ util.add_ingredient("bob-area-mining-drill-2", "tungsten-carbide", 3)
 
 
 -- RFP
-util.add_ingredient("rfp-pipe", "tungsten-plate", 2)
+if not util.me.cuw() then
-util.add_ingredient("rfp-pipe-to-ground", "tungsten-plate", 6)
+  -- keep old behvaior
-util.add_ingredient("rfp-pump", "tungsten-plate", 5)
+  util.add_ingredient("rfp-pipe", "tungsten-plate", 2)
-util.add_ingredient("rfp-heater", "tungsten-plate", 500)
+  util.add_ingredient("rfp-pipe-to-ground", "tungsten-plate", 6)
-util.add_ingredient("rfp-heat-exchanger", "tungsten-plate", 200)
+end
-util.add_ingredient("rfp-aneutronic-reactor", "tungsten-plate", 5000)
+util.add_ingredient("rfp-pump", cuw, 5)
-util.add_ingredient("rfp-direct-energy-converter", "tungsten-plate", 500)
+util.add_ingredient("rfp-heater", cuw, 500)
-util.add_ingredient("rfp-particle-accelerator", "tungsten-plate", 1000)
+util.add_ingredient("rfp-heat-exchanger", cuw, 200)
-util.add_ingredient("rfp-particle-decelerator", "tungsten-plate", 1000)
+util.add_ingredient("rfp-aneutronic-reactor", cuw, 5000)
-util.add_ingredient("rfp-antimatter-reactor", "tungsten-plate", 2000)
+util.add_ingredient("rfp-direct-energy-converter", cuw, 500)
-util.add_ingredient("rfw-plasma-thrower", "tungsten-plate", 10)
+util.add_ingredient("rfp-particle-accelerator", cuw, 1000)
-util.add_ingredient("rfw-plasma-thrower-turret", "tungsten-plate", 20)
+util.add_ingredient("rfp-particle-decelerator", cuw, 1000)
+util.add_ingredient("rfp-antimatter-reactor", cuw, 2000)
+util.add_ingredient("rfw-plasma-thrower", cuw, 10)
+util.add_ingredient("rfw-plasma-thrower-turret", cuw, 20)
 util.add_ingredient("rfw-thermonuclear-bomb", "rocket-engine-nozzle", 7)
 util.add_ingredient("rfw-thermonuclear-artillery-shell", "rocket-engine-nozzle", 7)
 util.add_ingredient("rfw-fusion-bomb", "rocket-engine-nozzle", 7)

tungsten-recipe.lua

@@ -206,6 +206,35 @@ data:extend({
   }
 })
 
+if util.me.cuw() then
+  data:extend({
+    {
+      type = "item",
+      name = "cuw",
+      icon = "__bztungsten__/graphics/icons/cuw.png",
+      icon_size = 128,
+      subgroup = "raw-material",
+      order = "z[cuw]",
+      stack_size = util.get_stack_size(100),
+    },
+    {
+      type = "recipe",
+      name = "cuw",
+      category = "advanced-crafting",
+      order = "z[cuw]",
+      enabled = false,
+      energy_required = 80,
+      ingredients = {
+        {"tungsten-plate", 15},
+        {"copper-plate", 5},
+      },
+      results = {{"cuw", 20}},
+    },
+  })
+  util.add_unlock(util.me.tungsten_processing, "cuw")
+end
+
+
 
 if mods.DoubleFurnace then
 data:extend({