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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2021-12-01 13:50:08 -05:00
parent e30d090a2e
commit 3f503a7f4d
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/ai/types/CargoAI.java
View File

@@ -179,6 +179,7 @@ public class CargoAI extends AIController{
} }
} }
//unused, might change later
void sortTargets(Seq<UnitCargoUnloadPointBuild> targets){ void sortTargets(Seq<UnitCargoUnloadPointBuild> targets){
//find sort by "most desirable" first //find sort by "most desirable" first
targets.sort(Structs.comps(Structs.comparingInt(b -> b.items.total()), Structs.comparingFloat(b -> b.dst2(unit)))); targets.sort(Structs.comps(Structs.comparingInt(b -> b.items.total()), Structs.comparingFloat(b -> b.dst2(unit))));

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

@@ -2112,7 +2112,7 @@ public class UnitTypes{
buildSpeed = 3f; buildSpeed = 3f;
abilities.add(new EnergyFieldAbility(35f, 65f, 180f){{ abilities.add(new EnergyFieldAbility(40f, 65f, 180f){{
statusDuration = 60f * 6f; statusDuration = 60f * 6f;
maxTargets = 25; maxTargets = 25;
}}); }});
@@ -2129,7 +2129,7 @@ public class UnitTypes{
shootEffect = Fx.sparkShoot; shootEffect = Fx.sparkShoot;
hitEffect = Fx.pointHit; hitEffect = Fx.pointHit;
maxRange = 180f; maxRange = 180f;
damage = 24f; damage = 25f;
}}; }};
}}); }});
} }

2
core/src/mindustry/entities/abilities/EnergyFieldAbility.java
View File

@@ -28,7 +28,7 @@ public class EnergyFieldAbility extends Ability{
public float x, y; public float x, y;
public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true; public boolean targetGround = true, targetAir = true, hitBuildings = true, hitUnits = true;
public int maxTargets = 25; public int maxTargets = 25;
public float healPercent = 2.5f; public float healPercent = 3f;
public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f; public float layer = Layer.bullet - 0.001f, blinkScl = 20f, blinkSize = 0.1f;
public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f; public float effectRadius = 5f, sectorRad = 0.14f, rotateSpeed = 0.5f;

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

@@ -143,7 +143,7 @@ public class StatValues{
if(state.isGame()){ if(state.isGame()){
var blocks = Vars.content.blocks() var blocks = Vars.content.blocks()
.select(block -> (!checkFloors || block instanceof Floor) && indexer.isBlockPresent(block) && block.attributes.get(attr) != 0 && !((block instanceof Floor f && f.isDeep()) && !floating)) .select(block -> (!checkFloors || block instanceof Floor) && indexer.isBlockPresent(block) && block.attributes.get(attr) != 0 && !((block instanceof Floor f && f.isDeep()) && !floating))
.<Floor>as().with(s -> s.sort(f -> f.attributes.get(attr))); .with(s -> s.sort(f -> f.attributes.get(attr)));
if(blocks.any()){ if(blocks.any()){
int i = 0; int i = 0;