From d201479a00433c8f3c46d2547e7acb14c2ee30e0 Mon Sep 17 00:00:00 2001 From: = Date: Sun, 1 Sep 2024 22:46:11 -0300 Subject: [PATCH] wawwawawawawawawawawwa --- assets/bundles/bundle.properties | 16 +++++++++ src/sw/content/SWBlocks.java | 59 -------------------------------- 2 files changed, 16 insertions(+), 59 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 989bcc5..246512b 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -207,6 +207,8 @@ liquid.sw-steam.name = Steam liquid.sw-steam.description = Low pressure solvent gas. liquid.sw-solvent.name = Solvent liquid.sw-solvent.description = A weird fluid used to dissolve resources in factories. +liquid.sw-fluorane.name = Fluorane +liquid.sw-fluorane.description = A weak acid in gas form. ## Planet @@ -260,5 +262,19 @@ unit.sw-robinia.description = A walking laser turret. Shoots weaving laser bulle unit.sw-gregarea.name = Gregarea unit.sw-gregarea.description = A insect like unit with a large plasma torch. +unit.sw-sentry.name = Sentry +unit.sw-sentry.descriptiong = A small artillery. +unit.sw-tower.name = Tower +unit.sw-tower.description = A medium artillery. +unit.sw-castle.name = Castle +unit.sw-castle.description = A large artillery. + +unit.sw-recluse.name = Recluse +unit.sw-recluse.descriptiong = A small submarine with sapping bulelts. Vulnerable within the range of a Unit Scanner. +unit.sw-retreat.name = Retreat +unit.sw-retreat.description = A unit with a small artillery mount. Vulnerable within the range of a Unit Scanner. +unit.sw-evade.name = Evade +unit.sw-evade.description = A large submarine with shrapnel and torpedoes. Vulnerable within the range of a Unit Scanner. + unit.sw-lambda.name = Lambda unit.sw-lambda.description = The core unit of the Core Scaffold, able to walk over all terrain. \ No newline at end of file diff --git a/src/sw/content/SWBlocks.java b/src/sw/content/SWBlocks.java index c332ee2..cff1b26 100644 --- a/src/sw/content/SWBlocks.java +++ b/src/sw/content/SWBlocks.java @@ -1,22 +1,11 @@ package sw.content; -import arc.util.*; -import mindustry.content.*; -import mindustry.type.*; import mindustry.world.*; -import mindustry.world.blocks.units.*; import sw.content.blocks.*; import sw.world.blocks.sandbox.*; -import sw.world.blocks.units.*; - -import static mindustry.type.ItemStack.*; public class SWBlocks { public static Block - subFactory, - constructor, - upgrader, - allSource; public static void load() { @@ -29,54 +18,6 @@ public static void load() { SWStorage.load(); SWTurrets.load(); - // region units - subFactory = new UnitFactory("submarine-factory") {{ - requirements(Category.units, with( - SWItems.compound, 120, - Items.lead, 140, - Items.graphite, 100 - )); - size = 3; - health = 160; - consumePower(1.5f); - plans.add(new UnitPlan(SWUnitTypes.recluse, 60f * 50f, with(Items.silicon, 15, Items.metaglass, 25, SWItems.compound, 20))); - }}; - - constructor = new UnitFactory("constructor") {{ - requirements(Category.units, with( - SWItems.nickel, 150, - SWItems.iron, 120, - Items.silicon, 100 - )); - size = 3; - health = 200; - plans.add( - new UnitPlan(SWUnitTypes.fly, 40 * Time.toSeconds, with(Items.silicon, 15, SWItems.iron, 10)), - new UnitPlan(SWUnitTypes.sentry, 80 * Time.toSeconds, with(Items.silicon, 25, SWItems.denseAlloy, 10)), - new UnitPlan(SWUnitTypes.recluse, 80 * Time.toSeconds, with(Items.silicon, 15, SWItems.compound, 20)) - ); - consumePower(1f); - consumeLiquid(SWLiquids.steam, 0.3f); - }}; - upgrader = new MultiReconstructor("upgrader") {{ - requirements(Category.units, with( - SWItems.nickel, 200, - SWItems.iron, 240, - Items.silicon, 220 - )); - size = 5; - health = 320; - constructTime = 10 * 60f; - upgrades.addAll( - new UnitType[]{SWUnitTypes.fly, SWUnitTypes.spin}, - new UnitType[]{SWUnitTypes.spin, SWUnitTypes.gyro}, - new UnitType[]{SWUnitTypes.sentry, SWUnitTypes.tower}, - new UnitType[]{SWUnitTypes.tower, SWUnitTypes.castle} - ); - consumeItems(with(Items.silicon, 400)); - }}; - // endregion - // region sandbox allSource = new ResourceSource("all-source") {{ health = 2147483647;