mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed turrets firing without power as players

Browse Source
This commit is contained in:
Anuken 2020-10-04 09:58:53 -04:00
parent c4fb84c359
commit 605a370679
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1731,7 +1731,7 @@ public class Blocks implements ContentList{
health = 150 * size * size;
consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true);
consumes.powerCond(10f, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
consumes.powerCond(10f, TurretBuild::isActive);
}};
spectre = new ItemTurret("spectre"){{

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

@ -1314,6 +1314,7 @@ public class UnitTypes implements ContentList{
buildSpeed = 4f;
drawShields = false;
commandLimit = 6;
lowAltitude = true;
ammoCapacity = 1300;
ammoResupplyAmount = 20;

2
core/src/mindustry/game/DefaultWaves.java
View File

@ -261,7 +261,7 @@ public class DefaultWaves{
curTier = Math.min(curTier, 3);
//small chance to switch species
if(Mathf.chance(0.2)){
if(Mathf.chance(0.3)){
curSpecies = Structs.random(species);
}
}

2
core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
View File

@ -20,7 +20,7 @@ public class PowerTurret extends Turret{
@Override
public void init(){
consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
consumes.powerCond(powerUse, TurretBuild::isActive);
super.init();
}

4
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@ -195,6 +195,10 @@ public abstract class Turret extends Block{
return logicControlTime > 0;
}
public boolean isActive(){
return target != null || (logicControlled() && logicShooting) || (isControlled() && unit.isShooting());
}
@Override
public void draw(){
Draw.rect(baseRegion, x, y);