Visuals and optimization

TeamOct · May 24, 2024 · 4ec0ce6 · 4ec0ce6
1 parent 54ded55
commit 4ec0ce6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/res/maps/awakening.msav b/res/maps/awakening.msav
diff --git a/src/fos/core/FOSMod.java b/src/fos/core/FOSMod.java
@@ -62,6 +62,13 @@ public FOSMod() {
             clientLoaded();
         });
 
+        Events.run(EventType.Trigger.newGame, () -> {
+            // remove landing cutscene on Awakening
+            if (state.rules.sector != null && state.rules.sector == FOSSectors.awakening.sector) {
+                Reflect.set(renderer, "landTime", 0f);
+            }
+        });
+
         Events.run(EventType.Trigger.update, () -> {
             if (!mobile) {
                 boolean useDiscord = !OS.hasProp("nodiscord");

diff --git a/src/fos/core/FOSVars.java b/src/fos/core/FOSVars.java
@@ -3,6 +3,7 @@
 import arc.Core;
 import arc.struct.Seq;
 import fos.ai.FOSPathfinder;
+import fos.content.FOSSectors;
 import fos.controllers.*;
 import fos.files.InternalFileTree;
 import fos.graphics.FOSOreRenderer;
@@ -16,6 +17,8 @@
 
 import java.util.*;
 
+import static mindustry.Vars.*;
+
 public class FOSVars {
     /** A research dialog that shows one of the two tech trees declared below. */
     public static ResearchCoreDialog researchCoreDialog;
@@ -90,4 +93,10 @@ public static void load() {
         TechTree.roots.remove(mechTree);
 */
     }
+
+    public static boolean mapStarted() {
+        return state.rules.sector != null && state.rules.sector == FOSSectors.awakening.sector ?
+            state.tick >= 160 :
+            renderer.getLandTime() <= 0;
+    }
 }
diff --git a/src/fos/io/DeathMapControl.java b/src/fos/io/DeathMapControl.java
@@ -12,6 +12,7 @@
 
 public class DeathMapControl implements SaveFileReader.CustomChunk {
     public volatile short[] deathMap;
+    public boolean shouldSave;
 
     public DeathMapControl() {
         Events.on(EventType.ResetEvent.class, e ->
@@ -34,6 +35,8 @@ public DeathMapControl() {
                 if (deathMap[tile.array()] < 0) {
                     deathMap[tile.array()] = Short.MAX_VALUE;
                 }
+
+                shouldSave = true;
             });
         });
 
@@ -65,10 +68,6 @@ public void read(DataInput stream) throws IOException {
 
     @Override
     public boolean shouldWrite() {
-        if (deathMap == null) return false;
-        for (int i : deathMap) {
-            if (i != 0) return true;
-        }
-        return false;
+        return deathMap != null && shouldSave;
     }
 }
diff --git a/src/fos/type/blocks/storage/DetectorCoreBlock.java b/src/fos/type/blocks/storage/DetectorCoreBlock.java
@@ -10,6 +10,7 @@
 import arc.util.Time;
 import arc.util.io.*;
 import fos.audio.FOSLoopsCore;
+import fos.core.FOSVars;
 import fos.type.blocks.environment.UndergroundOreBlock;
 import mindustry.Vars;
 import mindustry.game.Team;
@@ -135,7 +136,7 @@ public void buildConfiguration(Table table) {
         @Override
         public void draw() {
             super.draw();
-            if (canConsume() && team == player.team()) {
+            if (canConsume() && team == player.team() && FOSVars.mapStarted()) {
                 Draw.z(Layer.light);
                 Draw.alpha(0.6f);
                 Lines.stroke(2.5f, effectColor);
@@ -174,7 +175,7 @@ public void draw() {
 
         @Override
         public boolean shouldActiveSound() {
-            return canConsume() && showOres;
+            return canConsume() && showOres && FOSVars.mapStarted();
         }
 
         public float radarRot() {