diff --git a/core/assets-raw/sprites/blocks/payload/small-deconstructor.png b/core/assets-raw/sprites/blocks/payload/small-deconstructor.png new file mode 100644 index 0000000000..5b94843d65 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/small-deconstructor.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/horde.png b/core/assets-raw/sprites/blocks/turrets/horde.png index b871ef644c..4807ba2686 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/horde.png and b/core/assets-raw/sprites/blocks/turrets/horde.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 396ee9fcdb..995443e55a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -129,7 +129,7 @@ public class Blocks{ //payloads //TODO small deconstructor - payloadConveyor, payloadRouter, payloadPropulsionTower, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader, + payloadConveyor, payloadRouter, payloadPropulsionTower, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader, //logic message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank, @@ -3244,6 +3244,15 @@ public class Blocks{ consumes.power(6f); }}; + if(false) + smallDeconstructor = new PayloadDeconstructor("small-deconstructor"){{ + requirements(Category.units, with(Items.thorium, 80, Items.silicon, 80, Items.graphite, 80)); + itemCapacity = 100; + consumes.power(1f); + size = 3; + deconstructSpeed = 1f; + }}; + deconstructor = new PayloadDeconstructor("deconstructor"){{ requirements(Category.units, with(Items.thorium, 250, Items.silicon, 200, Items.graphite, 250)); itemCapacity = 250; diff --git a/gradle.properties b/gradle.properties index 6ee9ccabfb..ddb9285998 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=997803e9 +archash=997803e989