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

Filter locked items from stat values

Browse Source
This commit is contained in:
Anuken
2021-08-10 21:47:28 -04:00
parent 14dc293a09
commit d3a15fba96
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/input/DesktopInput.java
View File

@@ -646,13 +646,6 @@ public class DesktopInput extends InputHandler{
unit.moveAt(movement); unit.moveAt(movement);
}else{ }else{
unit.rotateMove(movement); unit.rotateMove(movement);
unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len()));
//problem: actual unit rotation is controlled by velocity, but velocity is 1) unpredictable and 2) can be set to 0
if(!movement.isZero()){
unit.rotation = Angles.moveToward(unit.rotation, movement.angle(), unit.type.rotateSpeed * Math.max(Time.delta, 1));
}
} }
unit.aim(unit.type.faceTarget ? Core.input.mouseWorld() : Tmp.v1.trns(unit.rotation, Core.input.mouseWorld().dst(unit)).add(unit.x, unit.y)); unit.aim(unit.type.faceTarget ? Core.input.mouseWorld() : Tmp.v1.trns(unit.rotation, Core.input.mouseWorld().dst(unit)).add(unit.x, unit.y));

8
core/src/mindustry/world/meta/StatValues.java
View File

@@ -49,11 +49,7 @@ public class StatValues{
public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){ public static StatValue liquids(Boolf<Liquid> filter, float amount, boolean perSecond){
return table -> { return table -> {
Seq<Liquid> list = new Seq<>(); Seq<Liquid> list = content.liquids().select(i -> filter.get(i) && i.unlockedNow());
for(Liquid item : content.liquids()){
if(!item.isHidden() && filter.get(item)) list.add(item);
}
for(int i = 0; i < list.size; i++){ for(int i = 0; i < list.size; i++){
table.add(new LiquidDisplay(list.get(i), amount, perSecond)).padRight(5); table.add(new LiquidDisplay(list.get(i), amount, perSecond)).padRight(5);
@@ -91,7 +87,7 @@ public class StatValues{
public static StatValue items(float timePeriod, Boolf<Item> filter){ public static StatValue items(float timePeriod, Boolf<Item> filter){
return table -> { return table -> {
Seq<Item> list = content.items().select(filter); Seq<Item> list = content.items().select(i -> filter.get(i) && i.unlockedNow());
for(int i = 0; i < list.size; i++){ for(int i = 0; i < list.size; i++){
Item item = list.get(i); Item item = list.get(i);