mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-24 13:31:45 -08:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse source
This commit is contained in:
Anuken 2020-11-13 17:33:32 -05:00
parent cf71356bdb
commit 04c465c8f0
8 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View file

@ -560,7 +560,7 @@ sector.overgrowth.name = Overgrowth
sector.tarFields.name = Tar Fields
sector.saltFlats.name = Salt Flats
sector.fungalPass.name = Fungal Pass
sector.biomassResearchFacility.name = Biomass Research Facility
sector.biomassFacility.name = Biomass Synthesis Facility
#unused
#sector.crags.name = Crags

BIN
core/assets/maps/biomassFacility.msav Normal file
View file

Binary file not shown.

BIN
core/assets/maps/biomassResearchFacility.msav
View file

Binary file not shown.

28
core/src/mindustry/ai/BlockIndexer.java
View file

@ -208,16 +208,30 @@ public class BlockIndexer{
public Seq<Tile> getEnemy(Team team, BlockFlag type){
returnArray.clear();
Seq<TeamData> data = state.teams.present;
for(int i = 0; i < data.size; i++){
Team enemy = data.items[i].team;
if(enemy == team) continue;
TileArray set = getFlagged(enemy)[type.ordinal()];
if(set != null){
for(Tile tile : set){
returnArray.add(tile);
//when team data is not initialized, scan through every team. this is terrible
if(data.isEmpty()){
for(Team enemy : Team.all){
if(enemy == team) continue;
TileArray set = getFlagged(enemy)[type.ordinal()];
if(set != null){
for(Tile tile : set){
returnArray.add(tile);
}
}
}
}else{
for(int i = 0; i < data.size; i++){
Team enemy = data.items[i].team;
if(enemy == team) continue;
TileArray set = getFlagged(enemy)[type.ordinal()];
if(set != null){
for(Tile tile : set){
returnArray.add(tile);
}
}
}
}
return returnArray;
}

8
core/src/mindustry/ai/Pathfinder.java
View file

@ -351,13 +351,7 @@ public class Pathfinder implements Runnable{
threadList.add(path);
//add to main thread's list of paths
Core.app.post(() -> {
mainList.add(path);
//TODO
//if(fieldMap[team.id] != null){
// fieldMap[team.id].put(target, path);
//}
});
Core.app.post(() -> mainList.add(path));
//fill with impassables by default
for(int x = 0; x < world.width(); x++){

2
core/src/mindustry/content/SectorPresets.java
View file

@ -31,7 +31,7 @@ public class SectorPresets implements ContentList{
difficulty = 2;
}};
biomassFacility = new SectorPreset("biomassResearchFacility", serpulo, 81){{
biomassFacility = new SectorPreset("biomassFacility", serpulo, 81){{
captureWave = 20;
difficulty = 3;
}};

4
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View file

@ -30,9 +30,7 @@ public class SchematicsDialog extends BaseDialog{
public SchematicsDialog(){
super("@schematics");
Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> {
((Texture)t).setWrap(TextureWrap.repeat);
};
Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> ((Texture)t).setWrap(TextureWrap.repeat);
shouldPause = true;
addCloseButton();

2
tools/src/mindustry/tools/FontGenerator.java
View file

@ -11,7 +11,7 @@ import java.io.*;
1. take set of pre-defined icons and SVGs
2. use Fontello API to get a font with these
3. combine fontello font and standard font, get output font
4. use apache ttf API to generate a file with constants for every icon size+type (during annotation processing)
4. use json to generate a file with constants for every icon size+type (during annotation processing)
*/
public class FontGenerator{