More visual improvements

TeamOct · May 25, 2024 · 775ea93 · 775ea93
1 parent dcf5f54
commit 775ea93
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/res/sprites/teams/team-corru-upscale.png b/res/sprites/teams/team-corru-upscale.png
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"));
             }
         }