Sector preset class / New missions

This commit is contained in:
Anuken
2018-10-05 16:36:50 -04:00
parent a771dc8787
commit 35bc2c9803
27 changed files with 174 additions and 76 deletions
@@ -20,6 +20,7 @@ import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.entities.impl.TimedEntity;
import io.anuke.ucore.util.Structs;
import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Pooling;
@@ -69,7 +70,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{
}
public static boolean has(int x, int y){
return Mathf.inBounds(x, y, world.width(), world.height()) && map.containsKey(x + y * world.width());
return Structs.inBounds(x, y, world.width(), world.height()) && map.containsKey(x + y * world.width());
}
/**
@@ -1,5 +1,17 @@
package io.anuke.mindustry.entities.units;
import io.anuke.ucore.util.Bundles;
public enum UnitCommand{
attack, retreat, patrol
attack, retreat, patrol;
private final String localized;
UnitCommand(){
localized = Bundles.get("command." + name());
}
public String localized(){
return localized;
}
}
@@ -29,10 +29,7 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Shapes;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.ThreadQueue;
import io.anuke.ucore.util.*;
import java.io.DataInput;
import java.io.DataOutput;
@@ -373,7 +370,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
if(entity == null){
return;
}
targetItem = Mathf.findMin(type.toMine, (a, b) -> -Integer.compare(entity.items.get(a), entity.items.get(b)));
targetItem = Structs.findMin(type.toMine, (a, b) -> -Integer.compare(entity.items.get(a), entity.items.get(b)));
}
@Override