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

Mech palette change, delta mech implementation

Browse Source
This commit is contained in:
Anuken
2018-06-26 16:01:40 -04:00
parent a6ca84308e
commit 20b3bb8f13
34 changed files with 674 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,7 +317,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
Draw.rect(mech.region, x, y, rotation -90);
for (int i : Mathf.signs) {
float tra = rotation - 90, trY = - mech.weapon.getRecoil(this, i > 0)*1.5f + mech.weaponOffsetY;
float tra = rotation - 90, trY = - mech.weapon.getRecoil(this, i > 0) + mech.weaponOffsetY;
float w = i > 0 ? -12 : 12;
Draw.rect(mech.weapon.equipRegion,
x + Angles.trnsx(tra, mech.weaponOffsetX * i, trY),
@@ -357,7 +357,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
float wobblyness = 0.6f;
trail.update(x + Angles.trnsx(rotation + 180f, 5f) + Mathf.range(wobblyness),
y + Angles.trnsy(rotation + 180f, 5f) + Mathf.range(wobblyness));
trail.draw(Palette.lighterOrange, Palette.lightishOrange, 5f * (isFlying() ? 1f : boostHeat));
trail.draw(mech.trailColor, mech.trailColor, 5f * (isFlying() ? 1f : boostHeat));
}else{
trail.clear();
}
@@ -676,6 +676,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
stream.writeBoolean(isLocal);
if(isLocal){
stream.writeByte(mech.id);
stream.writeByte(playerIndex);
super.writeSave(stream, false);
}
@@ -686,8 +687,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
boolean local = stream.readBoolean();
if(local){
byte mechid = stream.readByte();
int index = stream.readByte();
players[index].readSaveSuper(stream);
players[index].mech = Upgrade.getByID(mechid);
players[index].dead = false;
}
}

2
core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
View File

@@ -88,7 +88,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
@Override
public void drawOver() {
trail.draw(Palette.lightFlame, Palette.lightOrange, 5f);
trail.draw(Palette.lightTrail, Palette.lightTrail, 5f);
}
@Override

2
core/src/io/anuke/mindustry/entities/units/types/Drone.java
View File

@@ -162,7 +162,7 @@ public class Drone extends FlyingUnit implements BuilderTrait {
@Override
public void drawOver() {
trail.draw(Palette.lighterOrange, Palette.lightishOrange, 3f);
trail.draw(Palette.lightTrail, Palette.lightTrail, 3f);
if(target instanceof TileEntity && state.is(repair)){
float len = 5f;