From 775ea93b0237bc607cd2f89c3b98d12b3016e23d Mon Sep 17 00:00:00 2001 From: Slotterleet <62336673+Slotterleet@users.noreply.github.com> Date: Sat, 25 May 2024 23:17:49 +0300 Subject: [PATCH] More visual improvements --- res/sprites/teams/team-corru-upscale.png | Bin 0 -> 1112 bytes src/fos/ai/FOSPathfinder.java | 2 -- src/fos/content/FOSBlocks.java | 3 +-- src/fos/content/FOSFx.java | 11 +++++++++++ src/fos/core/FOSMod.java | 2 ++ src/fos/type/blocks/power/WindTurbine.java | 3 +-- 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 res/sprites/teams/team-corru-upscale.png diff --git a/res/sprites/teams/team-corru-upscale.png b/res/sprites/teams/team-corru-upscale.png new file mode 100644 index 0000000000000000000000000000000000000000..c81f2e70b4660dbebf456f2dee51b0a02e54410e GIT binary patch literal 1112 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U=i|kaSW-L z^LFm(vfBncF2`;E{*NyUxAVMvOsMlZ!<^lI9*jE_H3O3v6k7zGI8X_n$APts=bwN6 z0wfK{~{gnP^J|>{s&DG{%*=}bIyCiM!N~+XJ2MFy%Agx z{ZaYWE~QeH6Cw+;KPun;)43%kmGi>hACkHICr>gic3^(~$NIvNlvrVxeg>1ytUKWu ze9EjdqW*N*9WIhoJ@DmG_!rqpmpk?{YF{`so@OV3%tR()sENfG&l-7-NQTT7!|A8>5EsQB^1i{!P@$R;U$dZ{fnh$2au@#>L52qt6MQ~4 z#xXH`73$HlyWr2Tz^|$BD0>wb!xL|VO+Oss85?XkkBP~@&}9(NKltJi^IukmM=BEW zH3@AD4f|Q#MdW8FGdxf~Xn2%8X&>*IKVk3YTHilsI9GO0*YCHvS2zN8ItKqu^bk?B z?4853%+p}q4~IWe30*A8-SU@y@Taqt`YBx9T5hYp;kAcD=pPQFeCFMr2K#D6k+Nee94<*FIO zKU-e5tj?*(v6;!TsgI$YEBvpLx^~>|zGe1u-3<4(hpKx%*!y&k?!k2of&5{96BJ(6 zHtTYhv2@gJv5IVZG2M4s{q{$C4?;LK?wch2+g>}f&cx=>K+c!H4FYZUMS&Q z(anE_o8ipVhJ8O6fZ^z<#I>MfrYpmPVkeDBTRplffTqdx{hux|DMu3w3Z*_bMoR136Zro{jD4$XN@xQeXj(lcZw&*h>pWAb0nVxg(77}y$3kb$aIsg5>a(sAnWMYF- zniwO)q!txNVeQEb41q~Z3%fS{N#ctZo&waop_f7b)KMO^bX53AY=%HHYPO#Bi9M9< W#_^Y2&gsCSg2B_(&t;ucLK6V_Ki(Vw literal 0 HcmV?d00001 diff --git a/src/fos/ai/FOSPathfinder.java b/src/fos/ai/FOSPathfinder.java index 2d889517..53af1e1e 100644 --- a/src/fos/ai/FOSPathfinder.java +++ b/src/fos/ai/FOSPathfinder.java @@ -74,8 +74,6 @@ public FOSPathfinder() { wheight = world.height(); threadList = new Seq<>(); mainList = new Seq<>(); - //TODO: death map save - //FOSVars.deathMap = new short[world.width() * world.height()]; clearCache(); for(int i = 0; i < tiles.length; i++){ diff --git a/src/fos/content/FOSBlocks.java b/src/fos/content/FOSBlocks.java index 34f1263f..c6bd334b 100644 --- a/src/fos/content/FOSBlocks.java +++ b/src/fos/content/FOSBlocks.java @@ -1418,11 +1418,10 @@ diamond, new MissileBulletType(5f, 5){{ powerProduction = 0.8f; requirements(Category.power, with(tin, 40)); researchCost = with(tin, 160); - rotateSpeed = 1.8f; squareSprite = false; drawer = new DrawMulti( new DrawDefault(), - new DrawRegion("-rotator", 15f, true) + new DrawRegion("-rotator", 4f, true) ); }}; steamTurbine = new ConsumeGenerator("steam-turbine"){ diff --git a/src/fos/content/FOSFx.java b/src/fos/content/FOSFx.java index 6387fe78..b9514fee 100644 --- a/src/fos/content/FOSFx.java +++ b/src/fos/content/FOSFx.java @@ -5,6 +5,7 @@ import arc.graphics.g2d.*; import arc.math.geom.*; import arc.util.Tmp; +import fos.graphics.FOSPal; import fos.type.bullets.OhioBeamBulletType; import mindustry.entities.Effect; import mindustry.gen.*; @@ -186,11 +187,21 @@ public class FOSFx { Drawf.light(e.x, e.y, 20f * e.fslope(), Pal.lightFlame, 0.5f); }), + fireSmokeLong = new Effect(300f, e -> { color(Color.gray); randLenVectors(e.id, 1, 2f + e.fin() * 7f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); }); + }), + + corruLogo = new Effect(50f, e -> { + Draw.color(FOSPal.hacked); + Draw.alpha(e.fout()); + + Draw.rect(Core.atlas.find("fos-team-corru-upscale"), e.x, e.y, 64 * (1 + e.fin()), 64 * (1 + e.fin())); + + Draw.reset(); }); } diff --git a/src/fos/core/FOSMod.java b/src/fos/core/FOSMod.java index 0fd4a814..d5db1a29 100644 --- a/src/fos/core/FOSMod.java +++ b/src/fos/core/FOSMod.java @@ -66,6 +66,8 @@ public FOSMod() { // remove landing cutscene on Awakening if (state.rules.sector != null && state.rules.sector == FOSSectors.awakening.sector) { Reflect.set(renderer, "landTime", 0f); + var core = FOSTeams.corru.core(); + Time.run(160f, () -> FOSFx.corruLogo.at(core.x, core.y)); } }); diff --git a/src/fos/type/blocks/power/WindTurbine.java b/src/fos/type/blocks/power/WindTurbine.java index c3891c8e..c0ff5297 100644 --- a/src/fos/type/blocks/power/WindTurbine.java +++ b/src/fos/type/blocks/power/WindTurbine.java @@ -16,7 +16,6 @@ public class WindTurbine extends PowerGenerator { public float displayEfficiencyScale = 1f; - public float rotateSpeed = 1f; public Attribute attr = FOSAttributes.windPower; public WindTurbine(String name) { @@ -36,7 +35,7 @@ public void drawPlace(int x, int y, int rotation, boolean valid) { if (t != null && t.solid()) { a += 1 / (size * 2f); Draw.z(Layer.blockOver); - Drawf.square((x + edge.x) * 8, (y + edge.y) * 8, 4f, Mathf.degRad * 45, Color.valueOf("ff0000")); + Drawf.square((x + edge.x) * 8, (y + edge.y) * 8, 4f, Mathf.PI / 8, Color.valueOf("ff0000")); } }