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

things

Browse Source
This commit is contained in:
Anuken
2019-08-15 20:02:35 -04:00
parent 7f2a1374e4
commit 56c39799c8
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,7 +734,7 @@ public class Fx implements ContentList{
shootSmallFlame = new Effect(32f, e -> { shootSmallFlame = new Effect(32f, e -> {
Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, e.fin()); Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, e.fin());
Angles.randLenVectors(e.id, 8, e.finpow() * 44f, e.rotation, 10f, (x, y) -> { Angles.randLenVectors(e.id, 8, e.finpow() * 60f, e.rotation, 10f, (x, y) -> {
Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f); Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f);
}); });
@@ -744,7 +744,7 @@ public class Fx implements ContentList{
shootPyraFlame = new Effect(33f, e -> { shootPyraFlame = new Effect(33f, e -> {
Draw.color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.GRAY, e.fin()); Draw.color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.GRAY, e.fin());
Angles.randLenVectors(e.id, 10, e.finpow() * 50f, e.rotation, 10f, (x, y) -> { Angles.randLenVectors(e.id, 10, e.finpow() * 70f, e.rotation, 10f, (x, y) -> {
Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.6f); Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.6f);
}); });

8
core/src/io/anuke/mindustry/content/UnitTypes.java
View File

@@ -196,7 +196,7 @@ public class UnitTypes implements ContentList{
mass = 5f; mass = 5f;
hitsize = 20f; hitsize = 20f;
rotatespeed = 0.06f; rotatespeed = 0.06f;
health = 4000; health = 3000;
weapon = new Weapon("chaos"){{ weapon = new Weapon("chaos"){{
length = 8f; length = 8f;
reload = 50f; reload = 50f;
@@ -220,7 +220,7 @@ public class UnitTypes implements ContentList{
mass = 5f; mass = 5f;
hitsize = 20f; hitsize = 20f;
rotatespeed = 0.06f; rotatespeed = 0.06f;
health = 10000; health = 9000;
weapon = new Weapon("eradication"){{ weapon = new Weapon("eradication"){{
length = 13f; length = 13f;
reload = 30f; reload = 30f;
@@ -313,7 +313,7 @@ public class UnitTypes implements ContentList{
}}; }};
lich = new UnitType("lich", Revenant.class, Revenant::new){{ lich = new UnitType("lich", Revenant.class, Revenant::new){{
health = 7000; health = 6000;
mass = 20f; mass = 20f;
hitsize = 40f; hitsize = 40f;
speed = 0.01f; speed = 0.01f;
@@ -346,7 +346,7 @@ public class UnitTypes implements ContentList{
}}; }};
reaper = new UnitType("reaper", Revenant.class, Revenant::new){{ reaper = new UnitType("reaper", Revenant.class, Revenant::new){{
health = 13000; health = 11000;
mass = 30f; mass = 30f;
hitsize = 56f; hitsize = 56f;
speed = 0.01f; speed = 0.01f;

30
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -1,30 +1,28 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import io.anuke.arc.*; import io.anuke.arc.*;
import io.anuke.arc.files.FileHandle; import io.anuke.arc.files.*;
import io.anuke.arc.function.Consumer; import io.anuke.arc.function.*;
import io.anuke.arc.function.Predicate;
import io.anuke.arc.graphics.*; import io.anuke.arc.graphics.*;
import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.graphics.g2d.*;
import io.anuke.arc.graphics.glutils.FrameBuffer; import io.anuke.arc.graphics.glutils.*;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.*;
import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.scene.ui.layout.*; import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools; import io.anuke.arc.util.pooling.*;
import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.content.*;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.entities.effect.GroundEffectEntity; import io.anuke.mindustry.entities.effect.*;
import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.effect.GroundEffectEntity.*;
import io.anuke.mindustry.entities.impl.EffectEntity; import io.anuke.mindustry.entities.impl.*;
import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.entities.traits.*;
import io.anuke.mindustry.entities.type.*; import io.anuke.mindustry.entities.type.*;
import io.anuke.mindustry.game.EventType.DisposeEvent; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity; import io.anuke.mindustry.world.blocks.defense.ForceProjector.*;
import static io.anuke.arc.Core.*; import static io.anuke.arc.Core.*;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;