From fa421ddb24e2d9baf3c569bcbd0d7bba5aead4f8 Mon Sep 17 00:00:00 2001
From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Wed, 7 Feb 2024 21:57:22 -0800
Subject: [PATCH] Clearer names for shaders

---
 .../shaders/{drunk.frag => colorHallucination.frag} |  0
 assets/shaders/{drunkWaves.frag => distortion.frag} |  0
 src/drunkustry/audio/DrunkSound.java                |  2 +-
 src/drunkustry/graphics/DrunkColors.java            |  6 +++---
 src/drunkustry/graphics/DrunkShaders.java           | 13 ++++++-------
 src/drunkustry/graphics/DrunkWaves.java             |  6 +++---
 6 files changed, 13 insertions(+), 14 deletions(-)
 rename assets/shaders/{drunk.frag => colorHallucination.frag} (100%)
 rename assets/shaders/{drunkWaves.frag => distortion.frag} (100%)

diff --git a/assets/shaders/drunk.frag b/assets/shaders/colorHallucination.frag
similarity index 100%
rename from assets/shaders/drunk.frag
rename to assets/shaders/colorHallucination.frag
diff --git a/assets/shaders/drunkWaves.frag b/assets/shaders/distortion.frag
similarity index 100%
rename from assets/shaders/drunkWaves.frag
rename to assets/shaders/distortion.frag
diff --git a/src/drunkustry/audio/DrunkSound.java b/src/drunkustry/audio/DrunkSound.java
index e9d1ec5..053f14b 100644
--- a/src/drunkustry/audio/DrunkSound.java
+++ b/src/drunkustry/audio/DrunkSound.java
@@ -8,7 +8,7 @@
 
 public class DrunkSound{
     public static final FlangerFilter filter = new FlangerFilter(){{
-        set(0.2f, 0.4f);
+        set(0.1f, 0.3f);
     }};
 
     public static void init(){
diff --git a/src/drunkustry/graphics/DrunkColors.java b/src/drunkustry/graphics/DrunkColors.java
index dc26cf8..d8eada5 100644
--- a/src/drunkustry/graphics/DrunkColors.java
+++ b/src/drunkustry/graphics/DrunkColors.java
@@ -15,13 +15,13 @@ public class DrunkColors{
     public static void init(){
         drunkBuffer = new FrameBuffer();
 
-        Events.run(Trigger.drawOver, () -> {
+        Events.run(Trigger.draw, () -> {
             drunkBuffer.resize(graphics.getWidth(), graphics.getHeight());
-            Draw.draw(Layer.endPixeled + 2, () -> {
+            Draw.draw(Layer.endPixeled + 1, () -> {
                 drunkBuffer.begin(Color.clear);
                 Draw.rect();
                 drunkBuffer.end();
-                drunkBuffer.blit(DrunkShaders.drunkShader);
+                drunkBuffer.blit(DrunkShaders.colorHallucination);
             });
         });
     }
diff --git a/src/drunkustry/graphics/DrunkShaders.java b/src/drunkustry/graphics/DrunkShaders.java
index f22d6f5..6f53d4b 100644
--- a/src/drunkustry/graphics/DrunkShaders.java
+++ b/src/drunkustry/graphics/DrunkShaders.java
@@ -8,17 +8,16 @@
 import arc.util.*;
 import mindustry.graphics.Shaders.*;
 
-import static arc.Core.files;
-import static mindustry.Vars.renderer;
-import static mindustry.Vars.tree;
+import static arc.Core.*;
+import static mindustry.Vars.*;
 
 public class DrunkShaders{
-    public static DrunkShader drunkShader;
-    public static DrunkShader drunkWaves;
+    public static DrunkShader colorHallucination;
+    public static DrunkShader distortion;
 
     public static void init(){
-        drunkShader = new DrunkShader("drunk");
-        drunkWaves = new DrunkShader("drunkWaves");
+        colorHallucination = new DrunkShader("colorHallucination");
+        distortion = new DrunkShader("distortion");
     }
 
     /** Copy of {@link SurfaceShader} that's able to get my shader. */
diff --git a/src/drunkustry/graphics/DrunkWaves.java b/src/drunkustry/graphics/DrunkWaves.java
index cea74d2..38c4f92 100644
--- a/src/drunkustry/graphics/DrunkWaves.java
+++ b/src/drunkustry/graphics/DrunkWaves.java
@@ -15,12 +15,12 @@ public class DrunkWaves{
     public static void init(){
         wavesBuffer = new FrameBuffer();
 
-        Events.run(Trigger.drawOver, () -> {
+        Events.run(Trigger.draw, () -> {
             wavesBuffer.resize(graphics.getWidth(), graphics.getHeight());
             Draw.draw(Layer.background - 0.01f, () -> wavesBuffer.begin(Color.clear));
-            Draw.draw(Layer.endPixeled + 4, () -> {
+            Draw.draw(Layer.endPixeled + 2, () -> {
                 wavesBuffer.end();
-                wavesBuffer.blit(DrunkShaders.drunkWaves);
+                wavesBuffer.blit(DrunkShaders.distortion);
             });
         });
     }