steam drill overhaul, petroleum rework

assets/bundles/bundle.properties

@@ -26,7 +26,7 @@ item.uaw-item-sulphur.description = Byproduct of petroleum refining. Used in def
 ## Liquid
 liquid.uaw-liquid-petroleum.name = Liquefied Petroleum Gas
 liquid.uaw-liquid-petroleum.description = Highly refined liquid fuel derived from crude oil, utilized for both material synthesis and powering infrastructure.
-liquid.uaw-liquid-petroleum.details = The vast reserves of oil in our lands are bountiful, yet in their natural state, they are insufficient for our needs. Thus, the oil must undergo further refinement, to satiate the insatiable hunger of our great industries.
+liquid.uaw-liquid-petroleum.details = The vast reserves of oil in our lands are bountiful, yet in their natural state, they are insufficient for our needs. Thus, the liquid gold must undergo further refinement, to satiate the insatiable hunger of our great industries.
 
 ## Gasses
 liquid.uaw-gas-steam.name = Steam
@@ -44,11 +44,11 @@ block.uaw-steam-pump.description = Pumps and outputs liquid using high-pressure
 block.uaw-pulsometer-pump.name = Pulsometer Pump
 block.uaw-pulsometer-pump.description = Pumps and outputs lots of liquid using high-pressure steam.
 
-block.uaw-steam-drill.name = Steam Drill
-block.uaw-steam-drill.description = A steam-powered drill, capable of mining Titanium ore.\nOil, can be used for lubrication, increasing the efficiency.
+block.uaw-steam-bore.name = Steam Bore
+block.uaw-steam-bore.description = A steam-powered bore that can gather softer materials at increased efficiency. Also capable of drilling Titanium.
 
-block.uaw-advanced-steam-drill.name = Advanced Steam Drill
-block.uaw-advanced-steam-drill.description = Bigger, faster, and better than a regular Steam Drill, capable of mining much harder material. \nOil can be used for lubrication, increasing the efficiency.
+block.uaw-advanced-steam-bore.name = Advanced Steam Bore
+block.uaw-advanced-steam-bore.description = Bigger, faster, and better than a regular Steam Drill, capable of mining much harder material. \nOil can be used for lubrication, increasing the efficiency.
 
 block.uaw-steam-thumper.name = Steam Thumper
 block.uaw-steam-thumper.description = Injects high-pressure steam beneath surface coal veins, unearthing a highly potent fuel called anthracite.
@@ -127,7 +127,7 @@ block.uaw-lpg-heater.description = Produces heat by burning petroleum gas.
 # endregion Generators
 
 # region Crafters
-block.uaw-alloy-crucible.name = Alloy Crucible
+block.uaw-alloy-crucible.name = Stoutsteel Crucible
 block.uaw-alloy-crucible.description = Mixes Anthracite dust and other materials to produce an extraordinarily dense and durable alloy known as 'Stoutsteel'.
 
 block.uaw-gelatinizer.name = Cryofluid Gelatinizer
@@ -141,8 +141,11 @@ block.uaw-ironclad-compressor.name = Ironclad Compressor
 block.uaw-ironclad-compressor.description = A versatile general industrial compressor, fit for the handling of diverse raw materials, from making graphite to pressing spore for oil.
 block.uaw-ironclad-compressor.details = Features a modular design, enabling quick and efficient swapping of parts to suit a variety of needs.
 
+block.uaw-petrochemical-refinery.name = Petrochemical Refinery
+block.uaw-petrochemical-refinery.description = Refines raw oil into Liquefied Petroleum Gas with Sulphur as byproduct.
+
 block.uaw-petrochemical-distillery.name = Petrochemical Distillery
-block.uaw-petrochemical-distillery.description = Refines raw oil into Petroleum Gas with Sulphur as byproduct.
+block.uaw-petrochemical-distillery.description = Refines raw oil into Liquefied Petroleum Gas at more efficient rate with lesser byproduct. More efficient in hot locations.
 
 # endregion crafters
 
@@ -249,21 +252,19 @@ block.uaw-air-ground-factory.description = Produces air and ground vehicle. Outp
 block.uaw-air-ground-factory.details = After the cataclysmic event known as the Heavens Fall, the world as we knew it was forever changed. The pursuit of peace and prosperity came at a steep cost, one paid in the currency of blood and oil.
 
 block.uaw-naval-factory.name = Naval Yard
-block.uaw-naval-factory.description = Produces naval vessels. Output units can be used directly, or moved into reconstructors for upgrading.
+block.uaw-naval-factory.description = Produces naval vessels. Output units can be used directly, or moved into reconstructors for upgrading. \nMust be placed in water.
 block.uaw-naval-factory.details = Heavens Fall has wrought unprecedented changes upon the world, revealing new land while submerging previously habitable areas. Though humanity had long ago tamed the vast ocean, in this new age, survival will demand even greater ingenuity and resourcefulness.
 
 block.uaw-drone-factory.name = Automaton Assembly Yard
 block.uaw-drone-factory.description = Produces various automatons to assists in construction, logistics, or supports.
 block.uaw-drone-factory.details = What couldn't be done by flesh, steel takes over.
 
-block.uaw-exponential-petroleum-reconstructor.name = Exponential Petroleum Reconstructor
-block.uaw-exponential-petroleum-reconstructor.description = Upgrades Terran Tier 3 units into Tier 4.\n[accent]Can be deployed on[] [blue]water[].
+block.uaw-exponential-petroleum-reconstructor.name = Standard Unit Reassembly Facility
+block.uaw-exponential-petroleum-reconstructor.description = Upgrades UAW Tier 1 units into Tier 2.\n[accent]Can be deployed on[] [blue]water[].
 
-block.uaw-tetrative-petroleum-reconstructor.name = Tetrative Petroleum Reconstructor
-block.uaw-tetrative-petroleum-reconstructor.description = Upgrades Terran Tier 4 units into Tier 5.\n[accent]Can be deployed on[] [blue]water[].
+block.uaw-tetrative-petroleum-reconstructor.name = Advanced Unit Reassembly Facility
+block.uaw-tetrative-petroleum-reconstructor.description = Upgrades UAW Tier 3 units into Tier 4.\n[accent]Can be deployed on[] [blue]water[].
 
-block.uaw-pentative-petroleum-reconstructor.name = Pentative Petroleum Reconstructor
-block.uaw-pentative-petroleum-reconstructor.description = Upgrades Terran Tier 5 units into Tier 6.\n[accent]Can be deployed on[] [blue]water[].
 # endregion Unit Blocks
 
 # region Unit - Air

src/UAW/audiovisual/UAWDrawf.java

@@ -35,11 +35,11 @@ public static void unitConstruct(float x, float y, TextureRegion region, Color c
 	}
 
 	public static void unitConstruct(Building t, TextureRegion region, float rotation, float progress, float alpha, float time) {
-		unitConstruct(t, region, UAWPal.graphiteFront, rotation, progress, alpha, time);
+		unitConstruct(t, region, UAWPal.lpgMid, rotation, progress, alpha, time);
 	}
 
 	public static void unitConstruct(Building t, TextureRegion region, Color color, float rotation, float progress, float alpha, float time) {
-		unitConstruct(t, region, color, rotation, progress, alpha, time, t.block.size * tilesize - 4f);
+		unitConstruct(t, region, color, rotation, progress, alpha, time, t.block.size * tilesize - 8f);
 	}
 
 	public static void unitConstruct(Building t, TextureRegion region, Color color, float rotation, float progress, float alpha, float time, float size) {
@@ -54,7 +54,7 @@ public static void unitConstruct(Building t, TextureRegion region, Color color,
 		Draw.rect(region, t.x, t.y, rotation);
 		Draw.shader();
 
-		Draw.color(UAWPal.graphiteFront);
+		Draw.color(UAWPal.lpgMid);
 		Draw.alpha(alpha);
 
 		Lines.lineAngleCenter(t.x, t.y + Mathf.sin(time, timeScl, size / 2f), 0, size);

src/UAW/content/UAWTechTree.java

@@ -50,13 +50,17 @@ public static void load() {
 					});
 				});
 
-				node(steamDrill, () -> {
+				node(steamBore, () -> {
 					node(advancedSteamDrill);
 					node(ironcladCompressor, Seq.with(new Research(multiPress)), () -> {
 					});
 					node(steamThumper, () -> {
 						node(alloyCrucible, () -> {
 						});
+						node(petrochemicalRefinery, () -> {
+							node(petrochemicalDistillery, Seq.with(new Produce(stoutsteel)), () -> {
+							});
+						});
 					});
 				});
 
@@ -102,7 +106,7 @@ public static void load() {
 			});
 
 			// Units
-			node(airGroundFactory, () -> {
+			node(airGroundFactory, Seq.with(new Produce(stoutsteel), new Produce(UAWLiquids.petroleum)), () -> {
 				node(crotchety, () -> {
 					node(cantankerous, Seq.with(new Research(gelatinizer)), () -> {
 					});

src/UAW/content/blocks/UAWBlocksProduction.java

@@ -24,7 +24,10 @@
 public class UAWBlocksProduction {
 	public static Block placeholder,
 	// Drills
-	steamDrill, advancedSteamDrill, steamThumper,
+	steamBore, advancedSteamDrill,
+
+	// Thympers
+	steamThumper, blastThumper,
 
 	// Pumps
 	petroleumDerrick, steamPump, pulsometerPump,
@@ -33,67 +36,62 @@ public class UAWBlocksProduction {
 	gelatinizer, alloyCrucible, advancedAlloyCrucible,
 
 	// Steam Crafters
-	ironcladCompressor, steamPress, plastFabricator,
+	ironcladCompressor,
 
 	// Petroleum Crafter
-	petroleumCrucible,
+	blastCruicible,
 
 	// Petroleum
-	petrochemicalDistillery,
+	petrochemicalRefinery, petrochemicalDistillery,
 
 	// Liquid Mixer
-	cryofluidBlender, surgeMixer;
+	cryofluidBlender;
 
 	public static void load() {
 		// Drills
-		steamDrill = new UAWDrill("steam-drill") {{
+		steamBore = new Bore("steam-bore") {{
 			requirements(Category.production, with(
 				Items.copper, 24,
 				Items.graphite, 12
 			));
 			size = 2;
-			squareSprite = false;
+
 			tier = 3;
-			itemCapacity = 25;
-			drillTime = 300;
-			warmupSpeed = 0.001f;
-			hasLiquids = false;
-			drawRim = true;
-			updateEffectChance = 0.03f;
+			drillTime = 350;
+
 			updateEffect = UAWFx.cloudPuff(3.5f, UAWPal.steamMid);
 			drillEffect = Fx.mineBig;
 			ambientSound = Sounds.grinding;
-			ambientSoundVolume = 0.07f;
+
+			drillMultipliers.put(Items.sand, 1.5f);
+			drillMultipliers.put(Items.scrap, 1.25f);
+			drillMultipliers.put(Items.coal, 1.25f);
+			drillMultipliers.put(Items.titanium, 0.75f);
 
 			consumeLiquid(UAWLiquids.steam, 0.25f);
-			consumeLiquid(Liquids.oil, 0.05f).boost();
 		}};
-		advancedSteamDrill = new UAWDrill("advanced-steam-drill") {{
+		advancedSteamDrill = new Bore("advanced-steam-drill") {{
 			requirements(Category.production, with(
 				Items.copper, 85,
 				Items.silicon, 50,
 				Items.titanium, 40,
 				Items.graphite, 75
 			));
 			size = 3;
-			squareSprite = false;
 			tier = 4;
-			itemCapacity = 45;
+
 			drillTime = 180;
 			warmupSpeed = 0.0005f;
-			hasLiquids = true;
-			drawRim = true;
-			updateEffectChance = 0.03f;
+
 			updateEffect = UAWFx.cloudPuff(5f, UAWPal.steamMid);
 			drillEffect = Fx.mineBig;
 			rotateSpeed = 6f;
 			ambientSound = Sounds.grinding;
-			ambientSoundVolume = 0.07f;
 
 			consumeLiquid(UAWLiquids.steam, 1.8f);
-			consumeLiquid(Liquids.oil, 0.1f).boost();
 		}};
 
+		// Thumpers
 		steamThumper = new SpecificItemDrill("steam-thumper") {{
 			requirements(Category.production, with(
 				Items.copper, 55,
@@ -155,7 +153,7 @@ public static void load() {
 				Items.silicon, 25,
 				Items.titanium, 25
 			));
-			consumeLiquid(UAWLiquids.steam, 0.25f);
+			consumeLiquid(UAWLiquids.steam, 15 / tick);
 
 			size = 2;
 			pumpAmount = 0.2f;
@@ -255,7 +253,7 @@ public static void load() {
 		alloyCrucible = new GenericCrafter("alloy-crucible") {{
 			requirements(Category.crafting, with(
 				Items.titanium, 150,
-				Items.thorium, 125,
+				Items.copper, 250,
 				Items.metaglass, 95,
 				Items.silicon, 95,
 				Items.graphite, 95
@@ -409,7 +407,45 @@ public static void load() {
 		}};
 
 		// Petroleum
-		petrochemicalDistillery = new GenericCrafter("petrochemical-distillery") {{
+		petrochemicalRefinery = new GenericCrafter("petrochemical-refinery") {{
+			requirements(Category.crafting, ItemStack.mult(Blocks.rotaryPump.requirements, 1.5f));
+			size = 2;
+
+			hasItems = true;
+			hasLiquids = true;
+			rotate = false;
+			solid = true;
+			ignoreLiquidFullness = false;
+			outputsLiquid = true;
+
+			liquidCapacity = 180;
+			craftTime = 120;
+
+			consumeLiquids(LiquidStack.with(
+				UAWLiquids.steam, 120 / tick,
+				Liquids.oil, 90 / tick
+			));
+			outputLiquid = new LiquidStack(UAWLiquids.petroleum, 45 / tick);
+			outputItems = with(
+				UAWItems.sulphur, 2
+			);
+
+			squareSprite = false;
+			drawer = new DrawMulti(
+				new DrawRegion("-bottom"),
+				new DrawLiquidTile(UAWLiquids.petroleum) {{
+					padding = 5 * px;
+					drawLiquidLight = true;
+				}},
+				new DrawBlurSpin() {{
+					suffix = "-rotator";
+					rotateSpeed = 2.5f;
+					blurThresh = 10; //no Blur
+				}},
+				new DrawDefault()
+			);
+		}};
+		petrochemicalDistillery = new AttributeCrafter("petrochemical-distillery") {{
 			requirements(Category.crafting, with(
 				Items.copper, 250,
 				Items.titanium, 150,
@@ -424,20 +460,23 @@ public static void load() {
 			hasLiquids = true;
 			rotate = false;
 			solid = true;
+			ignoreLiquidFullness = true;
 			outputsLiquid = true;
 
-			liquidCapacity = 24f;
+			liquidCapacity = 360f;
 			craftTime = 120;
+			boostScale = 0.15f;
 
 			consumeLiquids(LiquidStack.with(
 				UAWLiquids.steam, 320 / tick,
-				Liquids.oil, 60f / tick
+				Liquids.oil, 180 / tick
 			));
-			outputLiquid = new LiquidStack(UAWLiquids.petroleum, 30f / tick);
+			outputLiquid = new LiquidStack(UAWLiquids.petroleum, 120f / tick);
 			outputItems = with(
 				UAWItems.sulphur, 1
 			);
 
+			squareSprite = false;
 			drawer = new DrawMulti(
 				new DrawRegion("-bottom"),
 				new DrawLiquidTile(UAWLiquids.petroleum) {{