From 603cb4295af1af87d15738cd4abe97a5d3400802 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 15 May 2020 00:11:50 -0400
Subject: [PATCH] Tweaks

---
 core/src/mindustry/content/Blocks.java           |  2 +-
 core/src/mindustry/content/Fx.java               |  4 ++--
 .../world/blocks/storage/LaunchPad.java          | 16 ++++------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index e008e664a4..45d7b4b862 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1320,7 +1320,7 @@ public class Blocks implements ContentList{
             requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 250, Items.silicon, 75, Items.lead, 100));
             size = 3;
             itemCapacity = 100;
-            launchTime = 60f * 15;
+            launchTime = 60f * 2;
             hasPower = true;
             consumes.power(4f);
         }};
diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 1a0680765d..95caa2b6b5 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -1153,10 +1153,10 @@ public class Fx{
         Lines.circle(e.x, e.y, 4f + e.finpow() * 120f);
     }),
 
-    launchPod = new Effect(40, e -> {
+    launchPod = new Effect(50, e -> {
         color(Pal.engine);
 
-        e.scaled(20f, f -> {
+        e.scaled(25f, f -> {
             stroke(f.fout() * 2f);
             Lines.circle(e.x, e.y, 4f + f.finpow() * 30f);
         });
diff --git a/core/src/mindustry/world/blocks/storage/LaunchPad.java b/core/src/mindustry/world/blocks/storage/LaunchPad.java
index d1625aec66..3db91d7ea3 100644
--- a/core/src/mindustry/world/blocks/storage/LaunchPad.java
+++ b/core/src/mindustry/world/blocks/storage/LaunchPad.java
@@ -72,7 +72,7 @@ public class LaunchPad extends Block{
                 Draw.reset();
             }
 
-            float cooldown = Mathf.clamp(timer.getTime(timerLaunch) / launchTime);
+            float cooldown = Mathf.clamp(timer.getTime(timerLaunch) / 60f);
 
             Draw.mixcol(lightColor, 1f - cooldown);
 
@@ -106,17 +106,14 @@ public class LaunchPad extends Block{
     @EntityDef(LaunchPayloadc.class)
     @Component
     static abstract class LaunchPayloadComp implements Drawc, Timedc, Teamc{
-        static final float speed = 3f;
-
         @Import float x,y;
 
-        float height;
         Array<ItemStack> stacks = new Array<>();
 
         @Override
         public void draw(){
             float alpha = fout(Interp.pow5Out);
-            float cx = x + fin(Interp.pow2In) * 90f, cy = y + height;
+            float cx = x + fin(Interp.pow2In) * 15f, cy = y + fin(Interp.pow5In) * 130f;
             float rotation = fin() * 120f;
 
             Draw.z(Layer.effect);
@@ -125,7 +122,7 @@ public class LaunchPad extends Block{
 
             float rad = 0.2f + fslope();
 
-            Fill.light(cx, cy, 10, 25f * rad, Pal.engine, Tmp.c1.set(Pal.engine).a(0f));
+            Fill.light(cx, cy, 10, 25f * rad, Tmp.c2.set(Pal.engine), Tmp.c1.set(Pal.engine).a(0f));
 
             for(int i = 0; i < 4; i++){
                 Drawf.tri(cx, cy, 6f, 40f * rad, i * 90f + rotation);
@@ -138,7 +135,7 @@ public class LaunchPad extends Block{
             Draw.alpha(alpha);
             Draw.rect("launchpod", cx, cy, rotation);
 
-            Tmp.v1.trns(225f, height);
+            Tmp.v1.trns(225f, fin(Interp.linear) * 250f);
 
             Draw.z(Layer.flyingUnit + 1);
             Draw.color(0, 0, 0, 0.22f * alpha);
@@ -147,11 +144,6 @@ public class LaunchPad extends Block{
             Draw.reset();
         }
 
-        @Override
-        public void update(){
-            height += Time.delta() * speed;
-        }
-
         @Override
         public void remove(){
             if(team() == Vars.state.rules.defaultTeam){