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

#3125

Browse Source
This commit is contained in:
Anuken
2020-10-26 10:07:33 -04:00
parent 78afbb3e95
commit 7370e398cc
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/UnitTypes.java
+5 -5
View File
@@ -1546,7 +1546,7 @@ public class UnitTypes implements ContentList{
xRand = 8f; xRand = 8f;
shotDelay = 1f; shotDelay = 1f;
bullet = new MissileBulletType(4.2f, 30){{ bullet = new MissileBulletType(4.2f, 40){{
homingPower = 0.12f; homingPower = 0.12f;
width = 8f; width = 8f;
height = 8f; height = 8f;
@@ -1554,8 +1554,8 @@ public class UnitTypes implements ContentList{
drag = -0.003f; drag = -0.003f;
homingRange = 80f; homingRange = 80f;
keepVelocity = false; keepVelocity = false;
splashDamageRadius = 30f; splashDamageRadius = 35f;
splashDamage = 35f; splashDamage = 45f;
lifetime = 56f; lifetime = 56f;
trailColor = Pal.bulletYellowBack; trailColor = Pal.bulletYellowBack;
backColor = Pal.bulletYellowBack; backColor = Pal.bulletYellowBack;
@@ -1568,7 +1568,7 @@ public class UnitTypes implements ContentList{
}}); }});
weapons.add(new Weapon("large-bullet-mount"){{ weapons.add(new Weapon("large-bullet-mount"){{
reload = 80f; reload = 60f;
cooldownTime = 90f; cooldownTime = 90f;
x = 70f/4f; x = 70f/4f;
y = -66f/4f; y = -66f/4f;
@@ -1583,7 +1583,7 @@ public class UnitTypes implements ContentList{
shots = 3; shots = 3;
shotDelay = 4f; shotDelay = 4f;
inaccuracy = 1f; inaccuracy = 1f;
bullet = new BasicBulletType(7f, 50){{ bullet = new BasicBulletType(7f, 55){{
width = 13f; width = 13f;
height = 19f; height = 19f;
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
core/src/mindustry/core/Renderer.java
+2 -1
View File
@@ -27,10 +27,11 @@ public class Renderer implements ApplicationListener{
public final Pixelator pixelator = new Pixelator(); public final Pixelator pixelator = new Pixelator();
public PlanetRenderer planets; public PlanetRenderer planets;
public @Nullable Bloom bloom;
public FrameBuffer effectBuffer = new FrameBuffer(); public FrameBuffer effectBuffer = new FrameBuffer();
public float laserOpacity = 1f; public float laserOpacity = 1f;
private Bloom bloom; //TODO unused
private FxProcessor fx = new FxProcessor(); private FxProcessor fx = new FxProcessor();
private Color clearColor = new Color(0f, 0f, 0f, 1f); private Color clearColor = new Color(0f, 0f, 0f, 1f);
private float targetscale = Scl.scl(4); private float targetscale = Scl.scl(4);
desktop/src/mindustry/desktop/DesktopLauncher.java
+1 -1
View File
@@ -246,7 +246,7 @@ public class DesktopLauncher extends ClientLauncher{
if(inGame){ if(inGame){
//TODO implement nice name for sector //TODO implement nice name for sector
gameMapWithWave = Strings.capitalize(state.map.name()); gameMapWithWave = Strings.capitalize(Strings.stripColors(state.map.name()));
if(state.rules.waves){ if(state.rules.waves){
gameMapWithWave += " | Wave " + state.wave; gameMapWithWave += " | Wave " + state.wave;