further updates and polish

Makefile

@@ -24,14 +24,14 @@ copy: link
 	mkdir -p ../$(v)
 	cp -rf * ../$(v)
 	rm -f ../$(v).zip
-	#cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*"
+	cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" -x "*.blend*"
 
 install: lint-changelog copy
+	cp -f ../$(v).zip ../../mods/
 	# Next 3 lines are dev only (uncomment zip lines and comment these)
-	rm -rf ../../mods/$(v)
+	#rm -rf ../../mods/$(v)
-	mkdir ../../mods/$(v)
+	#mkdir ../../mods/$(v)
-	cp -r * ../../mods/$(v)
+	#cp -r * ../../mods/$(v)
-	#cp -f ../$(v).zip ../../mods/
 
 lint-changelog: copy
 	python3 ../da-changelog-tools_0.0.14/changelog-checker.py --changelog ../$(v).zip

changelog.txt

@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.0
-Date: 2025-01-21
+Date: 2025-01-29
   Changes:
     - Update to Factorio 2.0 and Space Age, can be added to existing games. 
       Use /bz-regenerate to see help on regenerating ore patches (especially useful on Vulcanus)

compatibility/any-planet-start.lua

@@ -0,0 +1,15 @@
+local util = require("data-util");
+
+if mods["any-planet-start"] and util.me.get_setting("aps-planet") ~= "nauvis" then
+  util.set_prerequisite("graphite-processing", {})
+end
+if mods["any-planet-start"] and util.me.get_setting("aps-planet") == "vulcanus" then
+  util.set_tech_trigger("graphite-processing", {type="mine-entity", entity="huge-volcanic-rock"})
+elseif mods["any-planet-start"] and util.me.get_setting("aps-planet") == "fulgora" then
+  util.set_tech_trigger("graphite-processing", {type="craft-item", item="graphite", count=5})
+  util.remove_prerequisite("electronics", "graphite-processing")
+  util.set_prerequisite("electric-mining-drill", {})
+  util.set_tech_trigger("electric-mining-drill", {type="craft-item", item="medium-electric-pole", count=5}) 
+elseif mods["any-planet-start"] and util.me.get_setting("aps-planet") == "gleba" then
+  util.set_tech_trigger("graphite-processing", {type="mine-entity", entity="gleba-rock"})
+end

control-util.lua

@@ -173,7 +173,7 @@ function regenerate_ore(event)
         game.print("Could not find surface for "..planet..". May not exist, or may not yet be explored.")
         return
       end
-      if resource[1] == params[2] and resource[2] == planet then
+      if resource[1] == params[2] and (resource[2] == planet or "tenebris" == planet) then
         if #params == 5 then
           local settings = {frequency=params[3], size=params[4], richness=params[5]}
           local map_gen_settings = game.surfaces[planet].map_gen_settings

data-final-fixes.lua

@@ -3,11 +3,15 @@ require("carbon-recipe-final-k2")
 require("carbon-recipe-final-se")
 require("carbon-recipe-final-rrr")
 require("nanotubes-final")
-require("compatibility/vtkdeepcoremining")
+require("compatibility.vtkdeepcoremining")
+require("compatibility.any-planet-start")
 
 local futil = require("util")
 local util = require("data-util");
 
+util.add_minable_result("simple-entity", "huge-volcanic-rock", {type="item", name="flake-graphite", amount_min=10, amount_max=24})
+util.add_minable_result("simple-entity", "big-volcanic-rock", {type="item", name="rough-diamond", amount_min=5, amount_max=10})
+
 -- supercapacitors with graphene cloned from supercapacitors with activated carbon
 if data.raw.recipe["supercapacitor"] then
   local new_recipe = futil.table.deepcopy(data.raw.recipe["supercapacitor"])

data-updates.lua

@@ -1,3 +1,4 @@
+require("prototypes.carbon-asteroid-updates")
 require("carbon-recipe-updates")
 require("carbon-fiber-recipe-updates")
 require("map-gen-preset-updates")

locale/en/carbon.cfg

@@ -82,6 +82,7 @@ nanomaterial-nanotubes=__ITEM__se-nanomaterial__ from __ITEM__nanotubes__
 se-low-density-structure-beryllium=__ITEM__low-density-structure__
 dirty-water-filtration-graphite=Filter dirty water [item=flake-graphite]
 ammonia-from-spoilage=Ammonia from spoilage
+alternative-carbonic-asteroid-crushing=Elemental carbon asteroid crushing
 
 vtk-deepcore-mining-ore-chunk-refining-graphite-focus=__ITEM__graphite__ focused ore chunk refining
 vtk-deepcore-mining-ore-chunk-refining-diamond-focus=__ITEM__diamond__ focused ore chunk refining
@@ -91,6 +92,7 @@ vtk-deepcore-mining-diamond-chunk-refining=__ITEM__rough-diamond__ chunk refinin
 [recipe-description]
 graphite-carbon-black=Convert excess carbon black to graphite at an unfavorable ratio.
 graphite-synthesis=Synthesize graphite from expired biomatter and other hydrocarbons
+alternative-carbonic-asteroid-crushing=Focus on elemental carbon when crushing carbonic asteroids
 
 [surface-property-name]
 oxygen=Atmospheric oxygen

prototypes/basic-crusher.lua

@@ -65,7 +65,7 @@ data:extend({
   {
     type = "item",
     name = "basic-crusher",
-    icon = "__space-age__/graphics/icons/crusher.png",
+    icons = {{icon = "__space-age__/graphics/icons/crusher.png", icon_size=64, scale=0.8, tint={.7,.7,.7}}},
     subgroup = "production-machine",
     order = "s[crusher]",
     inventory_move_sound = item_sounds.drill_inventory_move,
@@ -78,6 +78,7 @@ data:extend({
   {
     type = "furnace",
     name = "basic-crusher",
+    icons = {{icon = "__space-age__/graphics/icons/crusher.png", icon_size=64, scale=0.8, tint={.7,.7,.7}}},
     source_inventory_size = 1,
     result_inventory_size = 1,
     icon = "__space-age__/graphics/icons/crusher.png",

prototypes/carbon-asteroid-updates.lua

@@ -0,0 +1,35 @@
+local util = require("data-util");
+
+if mods["space-age"] then
+  data:extend({
+    {
+      type = "recipe",
+      name = "alternative-carbonic-asteroid-crushing",
+      icons = 
+      {
+        {icon="__space-age__/graphics/icons/carbonic-asteroid-crushing.png", size=64},
+        {icon="__bzcarbon__/graphics/icons/flake-graphite.png", icon_size=128, scale=0.125, shift={8,0}},
+        {icon="__bzcarbon__/graphics/icons/rough-diamond.png", icon_size=128, scale=0.125, shift={-8,0}},
+      },
+      category = "crushing",
+      subgroup="space-crushing",
+      order = "b-a-z-b",
+      auto_recycle = false,
+      enabled = false,
+      ingredients =
+      {
+        {type = "item", name = "carbonic-asteroid-chunk", amount = 1}
+      },
+      energy_required = 5,
+      results =
+      {
+        {type = "item", name = "flake-graphite", amount = 10},
+        {type = "item", name = "rough-diamond", amount = 1, probability=0.5},
+        {type = "item", name = "carbonic-asteroid-chunk", amount = 1, probability = 0.1}
+      },
+      allow_productivity = true,
+      allow_decomposition = false
+    },
+  })
+  util.add_unlock("space-platform-thruster", "alternative-carbonic-asteroid-crushing")
+end