Boiler reworks

assets/bundles/bundle.properties

@@ -64,19 +64,19 @@ block.uaw-composite-heat-node.description = Durable heat node that transfers pow
 
 ## region Liquid
 block.uaw-hardened-conduit.name = Hardened Conduit
-block.uaw-hardened-conduit.description = Rapidly moves fluid forward, has a moderate flow rate and can handle high-temperature and volatile fluids such as [#82e9de]Phlogiston[]. \n\nDoes not leak. Conducts Power.
+block.uaw-hardened-conduit.description = Moves fluid forward, has a moderate flow rate and can handle high-temperature and volatile fluids such as [#82e9de]Phlogiston[]. \n\nDoes not leak. Conducts Power.
 
 block.uaw-stoutsteel-conduit.name = Stoutsteel Conduit
-block.uaw-stoutsteel-conduit.description = Rapidly moves fluid forward, has a high flow rate and can handle high-temperature and volatile fluids such as [#82e9de]Phlogiston[]. \n\nDoes not leak. Conducts Power. \n\nCan be deployed on [blue]water[]
+block.uaw-stoutsteel-conduit.description = Moves fluid forward, has a high flow rate and can handle high-temperature and volatile fluids such as [#82e9de]Phlogiston[]. \n\nDoes not leak. Conducts Power. \n\nCan be deployed on [blue]water[]
 
 block.uaw-stoutsteel-conduit-plated.name = Plated Stoutsteel Conduit
-block.uaw-stoutsteel-conduit-plated.description = Rapidly moves fluid forward, has a high flow rate and can handle high-temperature and volatile fluids such as [#82e9de]Phlogiston[].\nDoes not accept input from the sides. \n\nDoes not leak. Conducts Power.\n\nCan be deployed on [blue]water[]
+block.uaw-stoutsteel-conduit-plated.description = Moves fluid forward, has a high flow rate and can handle high-temperature and volatile fluids such as [#82e9de]Phlogiston[].\nDoes not accept input from the sides. \n\nDoes not leak. Conducts Power.\n\nCan be deployed on [blue]water[]
 
 block.uaw-stoutsteel-liquid-router.name = Stoutsteel Fluid Router
 block.uaw-stoutsteel-liquid-router.description = Accepts fluids from one direction and outputs them equally to up to 3 other directions. \n\nHeavily Armoured. Conducts Power.
 
 block.uaw-stoutsteel-liquid-junction.name = Stoutsteel Fluid Junction
-block.uaw-stoutsteel-liquid-junction.description = Rapidly moves fluids forward. Used in conjunction with pumps and other conduits. \n\nHeavily Armoured. Conducts Power.
+block.uaw-stoutsteel-liquid-junction.description = Moves fluids forward. Used in conjunction with pumps and other conduits. \n\nHeavily Armoured. Conducts Power.
 
 block.uaw-stoutsteel-liquid-bridge.name = Stoutsteel Fluid Bridge
 block.uaw-stoutsteel-liquid-bridge.description = Transports fluids over terrain or buildings faster and farther than a standard Liquid Bridge. \n\nHeavily Armoured.
@@ -94,22 +94,16 @@ block.uaw-advanced-steam-turbine.name = Advanced Steam Turbine
 block.uaw-advanced-steam-turbine.description = Uses steam to generate lots of power. The steam is then condensed back into water.
 ## endregion Power
 
-## region Steam
-block.uaw-steam-kettle.name = Steam Kettle
-block.uaw-steam-kettle.description = Boils water to produce steam.
-block.uaw-steam-kettle.details = Small and primitive, it could also be used to make instant noodles.
+## region Phlogiston
+block.uaw-basic-industrial-blaster.name = Basic Phlogistochemical Chamber
+block.uaw-basic-industrial-blaster.description = Generates phlogiston by igniting liquid petroleum with explosive materials.
 
-block.uaw-industrial-boiler.name = Industrial Boiler
-block.uaw-industrial-boiler.description = Generates steam by boiling water with flammable materials.
-block.uaw-industrial-boiler.details = A reinforced inner boiler allows this machine to use a variety of flammable materials to operate, assuming they're aren't explosive
-
-block.uaw-pressure-boiler.name = Pressure Boiler
-block.uaw-pressure-boiler.description = Generates steam significantly more efficient by boiling water with flammable materials.
-block.uaw-pressure-boiler.details = Water is heated with intense pressure, allowing it to boils above its boiling temperature.
+block.uaw-intermediate-industrial-blaster.name = Intermediate Phlogistochemical Chamber
+block.uaw-intermediate-industrial-blaster.description = Generates phlogiston significantly more efficient by igniting liquid petroleum with explosive materials.
 
 block.uaw-geothermal-boiler.name = Geothermal Boiler
-block.uaw-geothermal-boiler.description = Generates steam if placed in hot area.
-## endregion Steam
+block.uaw-geothermal-boiler.description = Slowly generates phlogiston if placed in hot area.
+## endregion Phlogiston
 
 ## region Heat
 block.uaw-vapour-heater.name = Vapour Heater
@@ -471,6 +465,7 @@ ability.razorrotor = [royal]Razor Rotors[]
 stat.hardness-tresh = + Bore Density
 stat.hardness-upper-tresh = + Denser Ore Bore Speed
 stat.hardness-lower-tresh = + Lighter Ore Bore Speed
+stat.fuel-efficiency-mult = Fuel Efficiency
 # endregion Stats
 
 # region Bullet Parameters

src/UAW/Vars.java

@@ -8,7 +8,7 @@ public class Vars implements Loadable {
 	/** Used for precise pixel based placements*/
 	public static final float px = 0.25f;
 
-	public static final float steamConversionScl = 3;
+	public static final float phlogConversionScl = 0.5f;
 	public static final float steamLoseScl = 0.5f;
 
 	public static final String modName = "uaw-";

src/UAW/audiovisual/UAWFx.java

@@ -933,6 +933,14 @@ public static Effect burstCloud(float size, float lifetime, int amount, float sp
 
 	// endregion burstCloud
 
+	public static Effect crucibleSmoke(Color color) {
+		return crucibleSmoke(160, color);
+	}
+
+	public static Effect crucibleSmoke(float lifetime, Color color) {
+		return crucibleSmoke(lifetime, 2, color);
+	}
+
 	/**
 	 * {@link Fx#surgeCruciSmoke}
 	 * @param lifetime
@@ -949,7 +957,7 @@ public static Effect crucibleSmoke(float lifetime, float particleRad, Color colo
 
 			rand.setSeed(e.id);
 			for (int i = 0; i < 3; i++) {
-				float len = rand.random(6f);
+				float len = rand.random(8f);
 				float rot = rand.range(40f) + e.rotation;
 
 				e.scaled(e.lifetime * rand.random(0.3f, 1f), b -> {

src/UAW/content/UAWItems.java

@@ -27,8 +27,8 @@ public static void load() {
 		sulphur = new Item("item-sulphur", Color.valueOf("e28654")) {{
 		}};
 		anthracite = new Item("item-anthracite", Color.valueOf("272727")) {{
-			flammability = 1.8f;
-			explosiveness = 0.25f;
+			flammability = 1.55f;
+			explosiveness = 0.55f;
 			hardness = 4;
 		}};
 	}

src/UAW/content/blocks/UAWBlocksDefence.java

@@ -306,7 +306,7 @@ Items.graphite, new TrailBulletType(12f, 25) {{
 
 					ammoMultiplier = 4;
 				}},
-				UAWItems.stoutsteel, new TrailBulletType(16f, 12) {{
+				UAWItems.stoutsteel, new TrailBulletType(16f, 15) {{
 					Color front = UAWPal.titaniumFront, back = UAWPal.titaniumBack;
 					height = 16f;
 					width = 7f;
@@ -332,7 +332,7 @@ UAWItems.stoutsteel, new TrailBulletType(16f, 12) {{
 
 					ammoMultiplier = 8;
 				}},
-				Items.pyratite, new TrailBulletType(10f, 15) {{
+				Items.pyratite, new TrailBulletType(10f, 20) {{
 					Color front = Pal.lightishOrange, back = Pal.lightOrange;
 					height = 16f;
 					width = 7f;
@@ -358,7 +358,7 @@ Items.pyratite, new TrailBulletType(10f, 15) {{
 
 					ammoMultiplier = 8;
 				}},
-				UAWItems.cryogel, new TrailBulletType(10f, 15) {{
+				UAWItems.cryogel, new TrailBulletType(10f, 20) {{
 					Color front = UAWPal.cryoFront, back = UAWPal.cryoBack;
 					height = 16f;
 					width = 7f;
@@ -384,7 +384,7 @@ UAWItems.cryogel, new TrailBulletType(10f, 15) {{
 
 					ammoMultiplier = 8;
 				}},
-				Items.surgeAlloy, new BasicBulletType(8, 15) {{
+				Items.surgeAlloy, new BasicBulletType(8, 20) {{
 					height = 25;
 					width = 8;
 					hitEffect = despawnEffect = new MultiEffect(Fx.hitBulletBig, Fx.lightning);
@@ -413,11 +413,11 @@ Items.surgeAlloy, new BasicBulletType(8, 15) {{
 						moveY = 4 * px;
 					}},
 					new RegionPart("-side") {{
-						progress = PartProgress.warmup.blend(PartProgress.heat, 0.45f).curve(Interp.smooth);
+						progress = PartProgress.warmup.blend(PartProgress.heat, 0.3f).curve(Interp.smooth);
 						mirror = true;
 						moveX = 2f * px;
 						moveY = -4 * px;
-						moveRot = -25f;
+						moveRot = -22.5f;
 					}},
 					new RegionPart("-blade") {{
 						progress = PartProgress.warmup;