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

Added final campaign map (WIP, untested)

Browse Source
This commit is contained in:
Anuken
2020-11-18 18:58:54 -05:00
parent 63d4428527
commit 1ef264d560
37 changed files with 9240 additions and 8906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/entities/bullet/BulletType.java
+5 -3
View File
@@ -161,7 +161,9 @@ public abstract class BulletType extends Content{
return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f;
}
public void hitTile(Bullet b, Building build, float initialHealth){
/** If direct is false, this is an indirect hit and the tile was already damaged.
* TODO this is a mess. */
public void hitTile(Bullet b, Building build, float initialHealth, boolean direct){
if(makeFire && build.team != b.team){
Fires.create(build.tile);
}
@@ -169,8 +171,8 @@ public abstract class BulletType extends Content{
if(healPercent > 0f && build.team == b.team && !(build.block instanceof ConstructBlock)){
Fx.healBlockFull.at(build.x, build.y, build.block.size, Pal.heal);
build.heal(healPercent / 100f * build.maxHealth());
}else if(build.team != b.team){
hit(b, build.x, build.y);
}else if(build.team != b.team && direct){
hit(b);
}
}
core/src/mindustry/entities/bullet/RailBulletType.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class RailBulletType extends BulletType{
}
@Override
public void hitTile(Bullet b, Building build, float initialHealth){
public void hitTile(Bullet b, Building build, float initialHealth, boolean direct){
handle(b, build, initialHealth);
}
}