mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Team#isEnemy is pointless

Browse Source
This commit is contained in:
Anuken 2023-05-21 03:59:08 -04:00
parent dc63112915
commit 564e81e734
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/dagger.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 523 B

2
core/src/mindustry/entities/Damage.java
View File

@ -600,7 +600,7 @@ public class Damage{
for(int dx = -trad; dx <= trad; dx++){ for(int dx = -trad; dx <= trad; dx++){
for(int dy = -trad; dy <= trad; dy++){ for(int dy = -trad; dy <= trad; dy++){
Tile tile = world.tile(Math.round(x / tilesize) + dx, Math.round(y / tilesize) + dy); Tile tile = world.tile(Math.round(x / tilesize) + dx, Math.round(y / tilesize) + dy);
if(tile != null && tile.build != null && (team == null ||team.isEnemy(tile.team())) && dx*dx + dy*dy <= trad*trad){ if(tile != null && tile.build != null && (team == null || team != tile.team()) && dx*dx + dy*dy <= trad*trad){
tile.build.damage(team, damage); tile.build.damage(team, damage);
} }
} }

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

@ -121,6 +121,8 @@ public class Team implements Comparable<Team>{
return isAI() && !rules().rtsAi; return isAI() && !rules().rtsAi;
} }
/** @deprecated There is absolutely no reason to use this. */
@Deprecated
public boolean isEnemy(Team other){ public boolean isEnemy(Team other){
return this != other; return this != other;
} }

2
core/src/mindustry/input/MobileInput.java
View File

@ -96,7 +96,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}else{ }else{
Building tile = world.buildWorld(x, y); Building tile = world.buildWorld(x, y);
if((tile != null && player.team().isEnemy(tile.team) && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){ if((tile != null && player.team() != tile.team && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
player.unit().mineTile = null; player.unit().mineTile = null;
target = tile; target = tile;
} }