From 3da04863200cb2c7029c1efe561a25815c684359 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 8 Jul 2022 17:07:49 -0400 Subject: [PATCH] Indonesian bundle loading hack --- .../sprites/blocks/turrets/divine/divine.png | Bin 0 -> 3236 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 4573 -> 4581 bytes core/src/mindustry/content/Blocks.java | 43 ++++++++++++++++-- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/turrets/divine/divine.png diff --git a/core/assets-raw/sprites/blocks/turrets/divine/divine.png b/core/assets-raw/sprites/blocks/turrets/divine/divine.png new file mode 100644 index 0000000000000000000000000000000000000000..dda307286057fe1acc4b8102d4adbcab9914e151 GIT binary patch literal 3236 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 X+6}8Uf1PGvU|{fc^>bP0l+XkK+z|oK literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index a0ef0e366e..0f1e0268a3 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -573,3 +573,4 @@ 63111=scathe-missile|unit-scathe-missile-ui 63110=ravage|block-ravage-ui 63109=underflow-duct|block-underflow-duct-ui +63108=divine|block-divine-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index eeb8d385bd6f43e4bdfdeef4a30de19ba6365d79..7898cd50d0a0cf9cd892ddf5c38357ae461aa18c 100644 GIT binary patch delta 23 fcmcbs{8X8V;m1a%JACYHDVb%Nd8v!<@-YJdZIB4P delta 16 YcmaE=d{>!?;rm9WJA9j;@%?8406pplM*si- diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 83bc1a63df..7def2dff57 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -136,7 +136,7 @@ public class Blocks{ duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami, //turrets - erekir - breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe, ravage, + breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe, ravage, divine, //units groundFactory, airFactory, navalFactory, @@ -4693,7 +4693,7 @@ public class Blocks{ reload = 100f; recoil = 2f; range = 300; - shootCone = 7f; + shootCone = 10f; scaledHealth = 350; rotateSpeed = 1.5f; @@ -4701,7 +4701,44 @@ public class Blocks{ limitRange(); }}; - //TODO 1 more turret + divine = new PowerTurret("divine"){{ + requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250, Items.phaseFabric, 300)); + + shootType = new BasicBulletType(7.5f, 85){{ + width = 12f; + hitSize = 7f; + height = 20f; + shootEffect = Fx.shootBig2; + smokeEffect = Fx.shootBigSmoke; + ammoMultiplier = 1; + pierceCap = 2; + pierce = true; + pierceBuilding = true; + hitColor = backColor = trailColor = Pal.berylShot; + frontColor = Color.white; + trailWidth = 2.1f; + trailLength = 10; + hitEffect = despawnEffect = Fx.hitBulletColor; + buildingDamageMultiplier = 0.3f; + }}; + + heatRequirement = 30f; + consumePower(5f); + + size = 5; + drawer = new DrawTurret("reinforced-"); + outlineColor = Pal.darkOutline; + envEnabled |= Env.space; + reload = 200f; + recoil = 2f; + range = 350; + shootCone = 100f; + scaledHealth = 370; + rotateSpeed = 2f; + + coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f)); + limitRange(5f); + }}; //endregion //region units