Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
Anuken
2020-05-15 00:11:50 -04:00
parent 931882fb6a
commit 603cb4295a
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -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)); requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 250, Items.silicon, 75, Items.lead, 100));
size = 3; size = 3;
itemCapacity = 100; itemCapacity = 100;
launchTime = 60f * 15; launchTime = 60f * 2;
hasPower = true; hasPower = true;
consumes.power(4f); consumes.power(4f);
}}; }};

4
core/src/mindustry/content/Fx.java
View File

@@ -1153,10 +1153,10 @@ public class Fx{
Lines.circle(e.x, e.y, 4f + e.finpow() * 120f); Lines.circle(e.x, e.y, 4f + e.finpow() * 120f);
}), }),
launchPod = new Effect(40, e -> { launchPod = new Effect(50, e -> {
color(Pal.engine); color(Pal.engine);
e.scaled(20f, f -> { e.scaled(25f, f -> {
stroke(f.fout() * 2f); stroke(f.fout() * 2f);
Lines.circle(e.x, e.y, 4f + f.finpow() * 30f); Lines.circle(e.x, e.y, 4f + f.finpow() * 30f);
}); });

16
core/src/mindustry/world/blocks/storage/LaunchPad.java
View File

@@ -72,7 +72,7 @@ public class LaunchPad extends Block{
Draw.reset(); Draw.reset();
} }
float cooldown = Mathf.clamp(timer.getTime(timerLaunch) / launchTime); float cooldown = Mathf.clamp(timer.getTime(timerLaunch) / 60f);
Draw.mixcol(lightColor, 1f - cooldown); Draw.mixcol(lightColor, 1f - cooldown);
@@ -106,17 +106,14 @@ public class LaunchPad extends Block{
@EntityDef(LaunchPayloadc.class) @EntityDef(LaunchPayloadc.class)
@Component @Component
static abstract class LaunchPayloadComp implements Drawc, Timedc, Teamc{ static abstract class LaunchPayloadComp implements Drawc, Timedc, Teamc{
static final float speed = 3f;
@Import float x,y; @Import float x,y;
float height;
Array<ItemStack> stacks = new Array<>(); Array<ItemStack> stacks = new Array<>();
@Override @Override
public void draw(){ public void draw(){
float alpha = fout(Interp.pow5Out); 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; float rotation = fin() * 120f;
Draw.z(Layer.effect); Draw.z(Layer.effect);
@@ -125,7 +122,7 @@ public class LaunchPad extends Block{
float rad = 0.2f + fslope(); 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++){ for(int i = 0; i < 4; i++){
Drawf.tri(cx, cy, 6f, 40f * rad, i * 90f + rotation); Drawf.tri(cx, cy, 6f, 40f * rad, i * 90f + rotation);
@@ -138,7 +135,7 @@ public class LaunchPad extends Block{
Draw.alpha(alpha); Draw.alpha(alpha);
Draw.rect("launchpod", cx, cy, rotation); 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.z(Layer.flyingUnit + 1);
Draw.color(0, 0, 0, 0.22f * alpha); Draw.color(0, 0, 0, 0.22f * alpha);
@@ -147,11 +144,6 @@ public class LaunchPad extends Block{
Draw.reset(); Draw.reset();
} }
@Override
public void update(){
height += Time.delta() * speed;
}
@Override @Override
public void remove(){ public void remove(){
if(team() == Vars.state.rules.defaultTeam){ if(team() == Vars.state.rules.defaultTeam){