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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-02-10 10:47:21 -05:00
parent 0ad8408ba9
commit 6c6861a97a
10 changed files with 40 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -140,8 +140,7 @@ public class ForceProjector extends Block{
paramTile = tile;
paramEntity = entity;
paramBlock = this;
//TODO fix
//bulletGroup.intersect(tile.drawx() - realRadius, tile.drawy() - realRadius, realRadius*2f, realRadius * 2f, shieldConsumer);
Groups.bullet.intersect(tile.drawx() - realRadius, tile.drawy() - realRadius, realRadius*2f, realRadius * 2f, shieldConsumer);
}
float realRadius(ForceEntity entity){

15
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -1,21 +1,19 @@
package mindustry.world.blocks.storage;
import arc.*;
import mindustry.annotations.Annotations.*;
import arc.struct.*;
import arc.func.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.gen.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.meta.*;
import mindustry.world.modules.*;
@@ -136,10 +134,9 @@ public class CoreBlock extends StorageBlock{
@Override
public float handleDamage(Tile tile, float amount){
//TODO implement
//if(player != null && tile.team() == player.team()){
// Events.fire(Trigger.teamCoreDamage);
//}
if(player != null && tile.team() == player.team()){
Events.fire(Trigger.teamCoreDamage);
}
return amount;
}

6
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -8,6 +8,7 @@ import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
@@ -52,14 +53,11 @@ public class UnitFactory extends Block{
Fx.producesmoke.at(tile.drawx(), tile.drawy());
if(!net.client()){
//TODO create the unit
/*
Unitc unit = factory.unitType.create(tile.team());
unit.setSpawner(tile);
unit.set(tile.drawx() + Mathf.range(4), tile.drawy() + Mathf.range(4));
unit.add();
unit.vel().y = factory.launchVelocity;
Events.fire(new UnitCreateEvent(unit));*/
Events.fire(new UnitCreateEvent(unit));
}
}