mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2287

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/SectorPresets.java
View File

@ -22,7 +22,7 @@ public class SectorPresets implements ContentList{
conditionWave = 5;
launchPeriod = 5;
rules = r -> {
r.winWave = 20;
r.winWave = 10;
};
}};

10
core/src/mindustry/content/UnitTypes.java
View File

@ -872,12 +872,12 @@ public class UnitTypes implements ContentList{
rotateSpeed = 15f;
accel = 0.1f;
itemCapacity = 30;
health = 80f;
health = 120f;
engineOffset = 6f;
hitsize = 8f;
weapons.add(new Weapon("small-basic-weapon"){{
reload = 20f;
reload = 17f;
x = 2.75f;
y = 1f;
@ -887,7 +887,7 @@ public class UnitTypes implements ContentList{
lifetime = 60f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
tileDamageMultiplier = 0.1f;
tileDamageMultiplier = 0.95f;
}};
}});
}};
@ -906,7 +906,7 @@ public class UnitTypes implements ContentList{
rotateSpeed = 17f;
accel = 0.1f;
itemCapacity = 50;
health = 120f;
health = 150f;
engineOffset = 6f;
hitsize = 9f;
rotateShooting = false;
@ -946,7 +946,7 @@ public class UnitTypes implements ContentList{
rotateSpeed = 19f;
accel = 0.11f;
itemCapacity = 70;
health = 160f;
health = 190f;
engineOffset = 6f;
hitsize = 10f;

1
core/src/mindustry/entities/Predict.java
View File

@ -57,6 +57,7 @@ public class Predict{
ddx += ((Hitboxc)dst).deltaX();
ddy += ((Hitboxc)dst).deltaY();
}
Log.info("attach dst = @, @ @", dst, ddx, ddy);
if(src instanceof Hitboxc){
ddx -= ((Hitboxc)src).deltaX()/(Time.delta);
ddy -= ((Hitboxc)src).deltaY()/(Time.delta);

4
core/src/mindustry/entities/comp/BuilderComp.java
View File

@ -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.*/
@Nullable
BuildPlan buildPlan(){

2
core/src/mindustry/entities/comp/MinerComp.java
View File

@ -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
|| (((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 = null;
mineTimer = 0f;