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

Player bufixes / Balancing

Browse Source
This commit is contained in:
Anuken
2018-08-27 13:46:33 -04:00
parent ac9d37d038
commit d8f9059989
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/io/anuke/mindustry/Vars.java
View File

@@ -49,22 +49,22 @@ public class Vars{
public static final int invalidSector = Integer.MAX_VALUE; public static final int invalidSector = Integer.MAX_VALUE;
public static Locale[] locales; public static Locale[] locales;
public static final Color[] playerColors = { public static final Color[] playerColors = {
Color.valueOf("82759a"), Color.valueOf("82759a"),
Color.valueOf("c0c1c5"), Color.valueOf("c0c1c5"),
Color.valueOf("fff0e7"), Color.valueOf("fff0e7"),
Color.valueOf("7d2953"), Color.valueOf("7d2953"),
Color.valueOf("ff074e"), Color.valueOf("ff074e"),
Color.valueOf("ff072a"), Color.valueOf("ff072a"),
Color.valueOf("ff76a6"), Color.valueOf("ff76a6"),
Color.valueOf("a95238"), Color.valueOf("a95238"),
Color.valueOf("ffa108"), Color.valueOf("ffa108"),
Color.valueOf("feeb2c"), Color.valueOf("feeb2c"),
Color.valueOf("ffcaa8"), Color.valueOf("ffcaa8"),
Color.valueOf("008551"), Color.valueOf("008551"),
Color.valueOf("00e339"), Color.valueOf("00e339"),
Color.valueOf("423c7b"), Color.valueOf("423c7b"),
Color.valueOf("4b5ef1"), Color.valueOf("4b5ef1"),
Color.valueOf("2cabfe"), Color.valueOf("2cabfe"),
}; };
//server port //server port
public static final int port = 6567; public static final int port = 6567;

2
core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
View File

@@ -63,7 +63,7 @@ public class MissileBullets extends BulletList implements ContentList{
drag = -0.003f; drag = -0.003f;
keepVelocity = false; keepVelocity = false;
splashDamageRadius = 20f; splashDamageRadius = 20f;
splashDamage = 3f; splashDamage = 1f;
lifetime = 90f; lifetime = 90f;
trailColor = Color.valueOf("b6c6fd"); trailColor = Color.valueOf("b6c6fd");
hiteffect = BulletFx.blastExplosion; hiteffect = BulletFx.blastExplosion;

1
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -702,6 +702,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
dead = true; dead = true;
trail.clear(); trail.clear();
health = maxHealth(); health = maxHealth();
altHeat = boostHeat = drownTime = hitTime = 0f;
mech = (isMobile ? Mechs.starterMobile : Mechs.starterDesktop); mech = (isMobile ? Mechs.starterMobile : Mechs.starterDesktop);
placeQueue.clear(); placeQueue.clear();