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

Minor bugfixes

Browse Source
This commit is contained in:
Anuken
2018-09-06 09:08:54 -04:00
parent ae30bdd599
commit f47fb01614
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,6 +252,7 @@ public class Mechs implements ContentList{
weaponOffsetX = -1; weaponOffsetX = -1;
weaponOffsetY = -1; weaponOffsetY = -1;
trailColor = Palette.lightTrail; trailColor = Palette.lightTrail;
cellTrnsY = 1f;
}}; }};
javelin = new Mech("javelin-ship", true){ javelin = new Mech("javelin-ship", true){
@@ -266,6 +267,7 @@ public class Mechs implements ContentList{
armor = 5f; armor = 5f;
weapon = Weapons.missiles; weapon = Weapons.missiles;
trailColor = Color.valueOf("d3ddff"); trailColor = Color.valueOf("d3ddff");
cellTrnsY = 1f;
} }
@Override @Override
@@ -321,6 +323,7 @@ public class Mechs implements ContentList{
itemCapacity = 30; itemCapacity = 30;
trailColor = Color.valueOf("84f491"); trailColor = Color.valueOf("84f491");
weapon = Weapons.bomberTrident; weapon = Weapons.bomberTrident;
cellTrnsY = 1f;
} }
@Override @Override
@@ -340,6 +343,7 @@ public class Mechs implements ContentList{
armor = 30f; armor = 30f;
itemCapacity = 60; itemCapacity = 60;
trailColor = Color.valueOf("feb380"); trailColor = Color.valueOf("feb380");
cellTrnsY = 1f;
} }
}; };

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

@@ -344,7 +344,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
Draw.color(Color.BLACK, team.color, healthf() + Mathf.absin(Timers.time(), healthf()*5f, 1f - healthf())); Draw.color(Color.BLACK, team.color, healthf() + Mathf.absin(Timers.time(), healthf()*5f, 1f - healthf()));
Draw.alpha(hitTime / hitDuration); Draw.alpha(hitTime / hitDuration);
Draw.rect(getPowerCellRegion(), x, y, rotation - 90); Draw.rect(getPowerCellRegion(), x + Angles.trnsx(rotation, mech.cellTrnsY, 0f), y + Angles.trnsy(rotation, mech.cellTrnsY, 0f), rotation - 90);
Draw.color(); Draw.color();
} }

1
core/src/io/anuke/mindustry/type/Mech.java
View File

@@ -28,6 +28,7 @@ public class Mech extends UnlockableContent{
public float armor = 1f; public float armor = 1f;
public float altChargeAlpha = 0.1f; public float altChargeAlpha = 0.1f;
public float cellTrnsY = 0f;
public float mineSpeed = 1f; public float mineSpeed = 1f;
public int drillPower = -1; public int drillPower = -1;
public float carryWeight = 10f; public float carryWeight = 10f;

2
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -44,7 +44,7 @@ public class BlockInventoryFragment extends Fragment{
@Remote(called = Loc.server, targets = Loc.both, forward = true) @Remote(called = Loc.server, targets = Loc.both, forward = true)
public static void requestItem(Player player, Tile tile, Item item, int amount){ public static void requestItem(Player player, Tile tile, Item item, int amount){
if(player == null) return; if(player == null || tile == null) return;
int removed = tile.block().removeStack(tile, item, amount); int removed = tile.block().removeStack(tile, item, amount);