Merge pull request #18 from Fatmice/0.6.6

0.6.6 -> master
Fatmice · Nov 23, 2016 · 2f7559d · 2f7559d
2 parents 293be83 + 1fcb0ae
commit 2f7559d
Show file tree

Hide file tree

Showing 136 changed files with 5,534 additions and 2,426 deletions.
diff --git a/control.lua b/control.lua
diff --git a/data-updates.lua b/data-updates.lua
@@ -0,0 +1,25 @@
+-- Compat for Bob's.  This replaces all of UP's oxygen, nitrogen, and hydrogen requiring or proving recipes to use Bob's equivalent gasses.
+-- Technological locks are still in place so for people playing with Bob's they must still pass over his hurdles, if required, to get at the gasses as well as UP's.
+-- Compat for Angel's is implicit since his mod provides a doodad that can covert Bob's gasses into Angel's.
+if bobmods.plates then
+
+	data.raw.recipe["atmospheric-distillation-n2-o2"].results = {
+		{type="fluid", name="nitrogen", amount=20},
+		{type="fluid", name="oxygen", amount=4}
+	}
+	data.raw.recipe["hydrogen-synthesis"].results = {
+		{type="fluid", name="hydrogen", amount=40}
+	}
+	data.raw.recipe["ammonia-synthesis"].ingredients = {
+		{type="fluid", name="nitrogen", amount=10},		
+		{type="fluid", name="hydrogen", amount=30},
+	}
+	data.raw.recipe["concentrate-nitric-acid-synthesis"].ingredients = {
+		{type="fluid", name="ammonia-gas", amount=40},
+		{type="fluid", name="oxygen", amount=80}			
+	}
+	data.raw.recipe["hydroxylamine-synthesis"].ingredients = {
+		{type="fluid", name="hydrogen", amount=30},		
+		{type="fluid", name="concentrate-nitric-acid", amount=10}		
+	}
+end
diff --git a/data.lua b/data.lua
@@ -17,6 +17,7 @@ require("prototypes.entity.projectiles")
 require("prototypes.entity.utility-entities")
 
 require("prototypes.fluid.fluid")
+require("prototypes.fluid.fuel-reprocessing-fluid")
 require("prototypes.fluid.uranium-hexafluoride-fluid")
 
 require("prototypes.item.ammo")
@@ -27,12 +28,14 @@ require("prototypes.item.fission-reactor-steam-generator-internals-item")
 require("prototypes.item.fission-reactor-turbine-generator-item")
 require("prototypes.item.fission-reactor-turbine-generator-internals-item")
 require("prototypes.item.fuel-assembly-item")
+require("prototypes.item.spent-fuel-assembly-item")
 require("prototypes.item.item")
 require("prototypes.item.uranium-pellet-item")
 
 require("prototypes.recipe.ammo-recipe")
 require("prototypes.recipe.fuel-assembly-recipe")
 require("prototypes.recipe.fluid-recipe")
+require("prototypes.recipe.fuel-reprocessing-fluid-recipe")
 require("prototypes.recipe.nuclear-fission-reactor-recipe")
 require("prototypes.recipe.nuclear-fission-reactor-steam-generator-recipe")
 require("prototypes.recipe.nuclear-fission-reactor-turbine-generator-recipe")

diff --git a/graphics/entity/coal-burner/coal-burner-fire.png b/graphics/entity/coal-burner/coal-burner-fire.png
diff --git a/graphics/entity/coal-burner/coal-burner-icon.png b/graphics/entity/coal-burner/coal-burner-icon.png
diff --git a/graphics/entity/coal-burner/coal-burner.png b/graphics/entity/coal-burner/coal-burner.png
diff --git a/graphics/entity/fast-pump/fast-pump-down.png b/graphics/entity/fast-pump/fast-pump-down.png
diff --git a/graphics/entity/fast-pump/fast-pump-left.png b/graphics/entity/fast-pump/fast-pump-left.png
diff --git a/graphics/entity/fast-pump/fast-pump-right.png b/graphics/entity/fast-pump/fast-pump-right.png
diff --git a/graphics/entity/fast-pump/fast-pump-up.png b/graphics/entity/fast-pump/fast-pump-up.png
diff --git a/graphics/entity/reactor-port/prototype-reactor-port.png b/graphics/entity/reactor-port/prototype-reactor-port.png
diff --git a/graphics/icons/PDBs/F2.png b/graphics/icons/PDBs/F2.png
diff --git a/graphics/icons/PDBs/H2.png b/graphics/icons/PDBs/H2.png
diff --git a/graphics/icons/PDBs/H3PO4.png b/graphics/icons/PDBs/H3PO4.png
diff --git a/graphics/icons/PDBs/HNO3.png b/graphics/icons/PDBs/HNO3.png
diff --git a/graphics/icons/PDBs/N2.png b/graphics/icons/PDBs/N2.png
diff --git a/graphics/icons/PDBs/NH2OH.png b/graphics/icons/PDBs/NH2OH.png
diff --git a/graphics/icons/PDBs/NH3.png b/graphics/icons/PDBs/NH3.png
diff --git a/graphics/icons/PDBs/O2.png b/graphics/icons/PDBs/O2.png
diff --git a/graphics/icons/PDBs/Pu(IV)TBP.png b/graphics/icons/PDBs/Pu(IV)TBP.png
diff --git a/graphics/icons/PDBs/Pu.png b/graphics/icons/PDBs/Pu.png
diff --git a/graphics/icons/PDBs/PuO2.png b/graphics/icons/PDBs/PuO2.png
diff --git a/graphics/icons/PDBs/TBP.png b/graphics/icons/PDBs/TBP.png
diff --git a/graphics/icons/PDBs/U.png b/graphics/icons/PDBs/U.png
diff --git a/graphics/icons/PDBs/UO2.png b/graphics/icons/PDBs/UO2.png
diff --git a/graphics/icons/PDBs/URANYLNITRATE.png b/graphics/icons/PDBs/URANYLNITRATE.png
diff --git a/graphics/icons/PDBs/UTBP.png b/graphics/icons/PDBs/UTBP.png
diff --git a/graphics/icons/PDBs/setting.pml b/graphics/icons/PDBs/setting.pml
@@ -0,0 +1,7 @@
+set_view (\
+     0.987016976,    0.118031666,    0.108894706,\
+     0.067280650,    0.311789215,   -0.947765529,\
+    -0.145819902,    0.942789435,    0.299804688,\
+     0.000000000,    0.000000000,  -14.178204536,\
+    -0.188799977,   -0.006799996,    0.037999988,\
+    11.178204536,   17.178203583,  -20.000000000 )
diff --git a/graphics/icons/coal-ash-extraction-recipe.png b/graphics/icons/coal-ash-extraction-recipe.png
diff --git a/graphics/icons/coal-ash-recipe.png b/graphics/icons/coal-ash-recipe.png
diff --git a/graphics/icons/coal-ash.png b/graphics/icons/coal-ash.png
diff --git a/graphics/icons/fast-pump.png b/graphics/icons/fast-pump.png
diff --git a/graphics/icons/pressure-pump.png b/graphics/icons/pressure-pump.png
diff --git a/graphics/icons/radioactive-graphic.png b/graphics/icons/radioactive-graphic.png
diff --git a/graphics/icons/reactor-port-icon.png b/graphics/icons/reactor-port-icon.png
diff --git a/graphics/icons/recycling-assets/atmospheric-distillation.png b/graphics/icons/recycling-assets/atmospheric-distillation.png
diff --git a/graphics/icons/recycling-assets/cladding.png b/graphics/icons/recycling-assets/cladding.png
diff --git a/graphics/icons/recycling-assets/conc-h3po4.png b/graphics/icons/recycling-assets/conc-h3po4.png
diff --git a/graphics/icons/recycling-assets/conc-hno3.png b/graphics/icons/recycling-assets/conc-hno3.png
diff --git a/graphics/icons/recycling-assets/dilute-hno3.png b/graphics/icons/recycling-assets/dilute-hno3.png
diff --git a/graphics/icons/recycling-assets/fuel-assembly-11.png b/graphics/icons/recycling-assets/fuel-assembly-11.png
diff --git a/graphics/icons/recycling-assets/h2-gas.png b/graphics/icons/recycling-assets/h2-gas.png
diff --git a/graphics/icons/recycling-assets/hno3-concentration-recipe.png b/graphics/icons/recycling-assets/hno3-concentration-recipe.png
diff --git a/graphics/icons/recycling-assets/hydroxylamine.png b/graphics/icons/recycling-assets/hydroxylamine.png
diff --git a/graphics/icons/recycling-assets/liquid-spent-fuel.png b/graphics/icons/recycling-assets/liquid-spent-fuel.png
diff --git a/graphics/icons/recycling-assets/mox-pellet.png b/graphics/icons/recycling-assets/mox-pellet.png
diff --git a/graphics/icons/recycling-assets/n2-gas.png b/graphics/icons/recycling-assets/n2-gas.png
diff --git a/graphics/icons/recycling-assets/nh3-gas.png b/graphics/icons/recycling-assets/nh3-gas.png
diff --git a/graphics/icons/recycling-assets/o2-gas.png b/graphics/icons/recycling-assets/o2-gas.png
diff --git a/graphics/icons/recycling-assets/primary-stream.png b/graphics/icons/recycling-assets/primary-stream.png
diff --git a/graphics/icons/recycling-assets/pu-aq.png b/graphics/icons/recycling-assets/pu-aq.png
diff --git a/graphics/icons/recycling-assets/pu-iv-aq.png b/graphics/icons/recycling-assets/pu-iv-aq.png
diff --git a/graphics/icons/recycling-assets/pu-iv-tbp.png b/graphics/icons/recycling-assets/pu-iv-tbp.png
diff --git a/graphics/icons/recycling-assets/pu-reductant.png b/graphics/icons/recycling-assets/pu-reductant.png
diff --git a/graphics/icons/recycling-assets/puo2.png b/graphics/icons/recycling-assets/puo2.png
diff --git a/graphics/icons/recycling-assets/recd-hno3.png b/graphics/icons/recycling-assets/recd-hno3.png
diff --git a/graphics/icons/recycling-assets/recovered-hno3.png b/graphics/icons/recycling-assets/recovered-hno3.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-04.png b/graphics/icons/recycling-assets/spent-fuel-assembly-04.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-05.png b/graphics/icons/recycling-assets/spent-fuel-assembly-05.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-06.png b/graphics/icons/recycling-assets/spent-fuel-assembly-06.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-07.png b/graphics/icons/recycling-assets/spent-fuel-assembly-07.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-08.png b/graphics/icons/recycling-assets/spent-fuel-assembly-08.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-09.png b/graphics/icons/recycling-assets/spent-fuel-assembly-09.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-10.png b/graphics/icons/recycling-assets/spent-fuel-assembly-10.png
diff --git a/graphics/icons/recycling-assets/spent-fuel-assembly-11.png b/graphics/icons/recycling-assets/spent-fuel-assembly-11.png
diff --git a/graphics/icons/recycling-assets/tbp.png b/graphics/icons/recycling-assets/tbp.png
diff --git a/graphics/icons/recycling-assets/u-aq.png b/graphics/icons/recycling-assets/u-aq.png
diff --git a/graphics/icons/recycling-assets/u-pu-partitioning.png b/graphics/icons/recycling-assets/u-pu-partitioning.png
diff --git a/graphics/icons/recycling-assets/u-tbp-aq.png b/graphics/icons/recycling-assets/u-tbp-aq.png
diff --git a/graphics/icons/recycling-assets/u-tbp.png b/graphics/icons/recycling-assets/u-tbp.png
diff --git a/graphics/icons/recycling-assets/uo2.png b/graphics/icons/recycling-assets/uo2.png
diff --git a/graphics/icons/recycling-assets/uranylnitrate.png b/graphics/icons/recycling-assets/uranylnitrate.png
diff --git a/graphics/icons/recycling-assets/waste-complex.png b/graphics/icons/recycling-assets/waste-complex.png
diff --git a/graphics/icons/recycling-assets/waste-glass.png b/graphics/icons/recycling-assets/waste-glass.png
diff --git a/graphics/icons/recycling-assets/waste-hno3.png b/graphics/icons/recycling-assets/waste-hno3.png
diff --git a/graphics/icons/recycling-assets/waste-tbp.png b/graphics/icons/recycling-assets/waste-tbp.png
diff --git a/graphics/icons/recycling-assets/waste.png b/graphics/icons/recycling-assets/waste.png
diff --git a/graphics/technology/advanced-fluid-management-tech-icon.png b/graphics/technology/advanced-fluid-management-tech-icon.png
diff --git a/graphics/technology/coal-processing-tech.png b/graphics/technology/coal-processing-tech.png
diff --git a/graphics/technology/fuel-fabrication-1.png b/graphics/technology/fuel-fabrication-1.png
diff --git a/graphics/technology/fuel-fabrication-2.png b/graphics/technology/fuel-fabrication-2.png
diff --git a/graphics/technology/fuel-fabrication.png b/graphics/technology/fuel-fabrication.png
diff --git a/graphics/technology/fuel-reprocessing-tech-icon.png b/graphics/technology/fuel-reprocessing-tech-icon.png
diff --git a/graphics/technology/heat-management-tech-icon.png b/graphics/technology/heat-management-tech-icon.png
diff --git a/graphics/technology/reactor-tech-icon.png b/graphics/technology/reactor-tech-icon.png
diff --git a/graphics/technology/reprocessing-prereq-tech-icon.png b/graphics/technology/reprocessing-prereq-tech-icon.png
diff --git a/graphics/technology/standard-fuel-processing-tech-icon.png b/graphics/technology/standard-fuel-processing-tech-icon.png
diff --git a/graphics/technology/uranium-bullet-tech-1.png b/graphics/technology/uranium-bullet-tech-1.png
diff --git a/graphics/technology/uranium-bullet-tech-2.png b/graphics/technology/uranium-bullet-tech-2.png
diff --git a/graphics/technology/uranium-bullet-tech-3.png b/graphics/technology/uranium-bullet-tech-3.png
diff --git a/graphics/technology/uranium-processing-tech.png b/graphics/technology/uranium-processing-tech.png
diff --git a/info.json b/info.json
@@ -1,11 +1,11 @@
 {
 	"name": "UraniumPower",
-	"version": "0.6.4",
+	"version": "0.6.6",
 	"title": "Uranium Power",
 	"author": "Fatmice(current), anshuy(current), Liquius(originator)",
 	"contact": "Fatmice",
 	"dependencies": ["base >= 0.13"],
 	"homepage": "http://www.factorioforums.com/forum/viewtopic.php?f=64&t=9502",
 	"description": "Mod that adds Uranium Technologies to Factorio",
-	"factorio_version": "0.13"
+	"factorio_version": "0.14"
 }
diff --git a/library/constants.lua b/library/constants.lua
@@ -1,26 +1,28 @@
---Fuel Assembly {type = {Potential Energy Factor, Decay Factor}}
+--Fuel Assembly {type = {Potential Energy Factor, Decay Factor, Decayed}}
 --Potential energy calculated from P(t)=P0e^(rt), where r = ln(2)/6 and P0 =  (1/210)(4/(e^[4r])).  This interestingly reduces to P(t) = 2^((t+2)/6)/105) where t = {t E Z | [4,inf)}
 fuelAssembly = {
-	["fuel-assembly-01"] = {0.0000, 0.010},
-	["fuel-assembly-02"] = {0.0000, 0.009},
-	["fuel-assembly-03"] = {0.0000, 0.008},
-	["fuel-assembly-04"] = {(2^(6/6))/105, 0.007},
-	["fuel-assembly-05"] = {(2^(7/6))/105, 0.006},
-	["fuel-assembly-06"] = {(2^(8/6))/105, 0.005},
-	["fuel-assembly-07"] = {(2^(9/6))/105, 0.004},
-	["fuel-assembly-08"] = {(2^(10/6))/105, 0.003},
-	["fuel-assembly-09"] = {(2^(11/6))/105, 0.002},
-	["fuel-assembly-10"] = {(2^(12/6))/105, 0.001}
+	["fuel-assembly-01"] = {0.0000, 0.010, nil},
+	["fuel-assembly-02"] = {0.0000, 0.009, nil},
+	["fuel-assembly-03"] = {0.0000, 0.008, nil },
+	["fuel-assembly-04"] = {(2^(6/6))/105, 0.007, "spent-fuel-assembly-04"},
+	["fuel-assembly-05"] = {(2^(7/6))/105, 0.006, "spent-fuel-assembly-05"},
+	["fuel-assembly-06"] = {(2^(8/6))/105, 0.005, "spent-fuel-assembly-06"},
+	["fuel-assembly-07"] = {(2^(9/6))/105, 0.004, "spent-fuel-assembly-07"},
+	["fuel-assembly-08"] = {(2^(10/6))/105, 0.003, "spent-fuel-assembly-08"},
+	["fuel-assembly-09"] = {(2^(11/6))/105, 0.002, "spent-fuel-assembly-09"},
+	["fuel-assembly-10"] = {(2^(12/6))/105, 0.001, "spent-fuel-assembly-10"},
+	["fuel-assembly-11"] = {(2^(13/6))/105, 0.001, "spent-fuel-assembly-11"}
 }
 
 --Reactor performance {type= = {Performance Factor, Energy Consumption/tick, Energy Buffer Size, Neutron Economy}}
 --Performance Factor is heat output compensation due to fuel decay
 --Energy Consumption/tick is in KJ and computed from prototype.energy_consumption/60
 --Energy Buffer Size is in KJ and computed from prototype.energy_consumption/60 * 16/15
+--Downstream Consumption
 --Neutron economy is breeding capacity of the reactor
 reactorType = {
-	["nuclear-fission-reactor-3-by-3"] = {14/3, 1200, 1280, 0.8},
-	["nuclear-fission-reactor-5-by-5"] = {175/18, 2400, 2560, 0.8}
+	["nuclear-fission-reactor-3-by-3"] = {23/3, 4000, 12800/3, 97920000, 1.14},
+	["nuclear-fission-reactor-5-by-5"] = {175/18, 5500, 17600/3, 195840000, 1.14}
 }
 
 --Steam generator internals {name = {[direction] = {Expected Reactor offset {x,y}, Hot Leg name and offset {name,direction,x,y}, Cold Leg name and offset {x,y}}, ["name"] = {base_area}}}
@@ -34,19 +36,9 @@ steamGeneratorInternals = {
 		[4] = {{-1,-4},{"reactor-pipe-bus-horiz",4,0,-2},{"steam-generator-01-cold-input",4,2,1}},  --was cold input 01, horizontal pipe bus 2 dir 4
 		[6] = {{4,-1},{"reactor-pipe-bus-vert",4,2,0},{"steam-generator-01-cold-input",6,-2,2}},  --was cold input 04, vertical pipe bus 2 dir 4
 		["self"] = {300},
-		["reactor-pipe-bus-vert"] = {50},
-		["reactor-pipe-bus-horiz"] = {50},
+		["reactor-pipe-bus-vert"] = {150},
+		["reactor-pipe-bus-horiz"] = {150},
 		["steam-generator-01-cold-input"] = {10},
-	},
-	["reactor-steam-generator-02"] = {
-		[0] = {{},{1,2},{-2,2},{-2,-1}},
-		[2] = {{},{-2,1},{-2,-2},{1,-2}},
-		[4] = {{},{-1,-2},{2,-2},{2,1}},
-		[6] = {{},{2,-1},{2,2},{-1,2}},
-		["self"] = {},
-		["steam-generator-02-hot-input"] = {},
-		["steam-generator-02-hot-return"] = {},
-		["steam-generator-02-cold-input"] = {}
 	}
 }
 
@@ -56,9 +48,9 @@ turbineGeneratorInternals = {
 	["reactor-turbine-generator-01a"] = {
 		[0] = {{"turbine-generator-low-p-steam-box-01",0,1,3},{"turbine-generator-cold-leg-box",0,-3,-3},{"turbine-generator-feed-water-box",0,6,2}},
 		[2] = {{"turbine-generator-low-p-steam-box-02",0,-3,0},{"turbine-generator-cold-leg-box",2,3,-3},{"turbine-generator-feed-water-box",2,-2,4}},
-		["fluid_usage_per_tick"] = {6.200},
+		["fluid_usage_per_tick"] = {9.000},
 		["effectivity"] = {0.95},
-		["energy_buffer_capacity"] = {1602080/3},
+		["energy_buffer_capacity"] = {775200},
 		["self"] = {10},
 		["turbine-generator-low-p-steam-box-01"] = {50},
 		["turbine-generator-low-p-steam-box-02"] = {50},
@@ -70,9 +62,9 @@ turbineGeneratorInternals = {
 	["reactor-turbine-generator-01b"] = {
 		[0] = {{"turbine-generator-low-p-steam-box-03",0,0,-3},{"turbine-generator-cold-leg-box",0,3,3},{"turbine-generator-feed-water-box",0,-6,-2}},
 		[2] = {{"turbine-generator-low-p-steam-box-04",0,3,0},{"turbine-generator-cold-leg-box",2,-3,3},{"turbine-generator-feed-water-box",2,2,-4}},
-		["fluid_usage_per_tick"] = {6.200},
+		["fluid_usage_per_tick"] = {9.000},
 		["effectivity"] = {0.95},
-		["energy_buffer_capacity"] = {1602080/3},
+		["energy_buffer_capacity"] = {775200},
 		["self"] = {10},
 		["turbine-generator-low-p-steam-box-01"] = {50},
 		["turbine-generator-low-p-steam-box-02"] = {50},

diff --git a/library/find res.lua b/library/find res.lua
@@ -1,6 +1,6 @@
 0.13.x
 /c local chunks = game.surfaces[1].get_chunks();
-local res={["fluorite"]={count=0,piles=0},["uraninite"]={count=0,piles=0}};
+local res={["coal"]={count=0,piles=0},["uraninite"]={count=0,piles=0}};
 local chunkcount = 0
 for chunk in chunks do 
 	local resource=game.surfaces[1].find_entities_filtered{area={{chunk.x*32, chunk.y*32}, {(chunk.x+1)*32, (chunk.y+1)*32}},type="resource"};

diff --git a/library/train.lua b/library/train.lua