This commit is contained in:
Anuken
2020-07-30 19:59:31 -04:00
parent a297d11023
commit 5ad2807958
5 changed files with 12 additions and 7 deletions
@@ -22,7 +22,7 @@ public class SectorPresets implements ContentList{
conditionWave = 5; conditionWave = 5;
launchPeriod = 5; launchPeriod = 5;
rules = r -> { rules = r -> {
r.winWave = 20; r.winWave = 10;
}; };
}}; }};
+5 -5
View File
@@ -872,12 +872,12 @@ public class UnitTypes implements ContentList{
rotateSpeed = 15f; rotateSpeed = 15f;
accel = 0.1f; accel = 0.1f;
itemCapacity = 30; itemCapacity = 30;
health = 80f; health = 120f;
engineOffset = 6f; engineOffset = 6f;
hitsize = 8f; hitsize = 8f;
weapons.add(new Weapon("small-basic-weapon"){{ weapons.add(new Weapon("small-basic-weapon"){{
reload = 20f; reload = 17f;
x = 2.75f; x = 2.75f;
y = 1f; y = 1f;
@@ -887,7 +887,7 @@ public class UnitTypes implements ContentList{
lifetime = 60f; lifetime = 60f;
shootEffect = Fx.shootSmall; shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke; smokeEffect = Fx.shootSmallSmoke;
tileDamageMultiplier = 0.1f; tileDamageMultiplier = 0.95f;
}}; }};
}}); }});
}}; }};
@@ -906,7 +906,7 @@ public class UnitTypes implements ContentList{
rotateSpeed = 17f; rotateSpeed = 17f;
accel = 0.1f; accel = 0.1f;
itemCapacity = 50; itemCapacity = 50;
health = 120f; health = 150f;
engineOffset = 6f; engineOffset = 6f;
hitsize = 9f; hitsize = 9f;
rotateShooting = false; rotateShooting = false;
@@ -946,7 +946,7 @@ public class UnitTypes implements ContentList{
rotateSpeed = 19f; rotateSpeed = 19f;
accel = 0.11f; accel = 0.11f;
itemCapacity = 70; itemCapacity = 70;
health = 160f; health = 190f;
engineOffset = 6f; engineOffset = 6f;
hitsize = 10f; hitsize = 10f;
+1
View File
@@ -57,6 +57,7 @@ public class Predict{
ddx += ((Hitboxc)dst).deltaX(); ddx += ((Hitboxc)dst).deltaX();
ddy += ((Hitboxc)dst).deltaY(); ddy += ((Hitboxc)dst).deltaY();
} }
Log.info("attach dst = @, @ @", dst, ddx, ddy);
if(src instanceof Hitboxc){ if(src instanceof Hitboxc){
ddx -= ((Hitboxc)src).deltaX()/(Time.delta); ddx -= ((Hitboxc)src).deltaX()/(Time.delta);
ddy -= ((Hitboxc)src).deltaY()/(Time.delta); ddy -= ((Hitboxc)src).deltaY()/(Time.delta);
@@ -200,6 +200,10 @@ abstract class BuilderComp implements Unitc{
} }
} }
boolean activelyBuilding(){
return isBuilding() && updateBuilding;
}
/** Return the build request currently active, or the one at the top of the queue.*/ /** Return the build request currently active, or the one at the top of the queue.*/
@Nullable @Nullable
BuildPlan buildPlan(){ BuildPlan buildPlan(){
@@ -51,7 +51,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
} }
if(mineTile == null || core == null || mineTile.block() != Blocks.air || dst(mineTile.worldx(), mineTile.worldy()) > miningRange if(mineTile == null || core == null || mineTile.block() != Blocks.air || dst(mineTile.worldx(), mineTile.worldy()) > miningRange
|| (((Object)this) instanceof Builderc && ((Builderc)(Object)this).isBuilding()) || (((Object)this) instanceof Builderc && ((Builderc)(Object)this).activelyBuilding())
|| mineTile.drop() == null || !acceptsItem(mineTile.drop()) || !canMine(mineTile.drop())){ || mineTile.drop() == null || !acceptsItem(mineTile.drop()) || !canMine(mineTile.drop())){
mineTile = null; mineTile = null;
mineTimer = 0f; mineTimer = 0f;