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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 JJ;Po}{vX^C0nY#c 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