From 04c465c8f0968c2500ef7efa7bc7daf1cb73e17e Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Nov 2020 17:33:32 -0500 Subject: [PATCH] Bugfixes --- core/assets/bundles/bundle.properties | 2 +- core/assets/maps/biomassFacility.msav | Bin 0 -> 15179 bytes core/assets/maps/biomassResearchFacility.msav | Bin 15169 -> 0 bytes core/src/mindustry/ai/BlockIndexer.java | 28 +++++++++++++----- core/src/mindustry/ai/Pathfinder.java | 8 +---- core/src/mindustry/content/SectorPresets.java | 2 +- .../ui/dialogs/SchematicsDialog.java | 4 +-- tools/src/mindustry/tools/FontGenerator.java | 2 +- 8 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 core/assets/maps/biomassFacility.msav delete mode 100644 core/assets/maps/biomassResearchFacility.msav diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5ec95a64bd..671eff2048 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -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 diff --git a/core/assets/maps/biomassFacility.msav b/core/assets/maps/biomassFacility.msav new file mode 100644 index 0000000000000000000000000000000000000000..37132355e28919271252805fbe0f95adf12d912d GIT binary patch literal 15179 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 diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index b61511684d..3fc012eeaa 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -208,16 +208,30 @@ public class BlockIndexer{ public Seq getEnemy(Team team, BlockFlag type){ returnArray.clear(); Seq 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; } diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index d36cb32291..e26ae14fd0 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -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++){ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 804c6769da..8b1459552a 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -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; }}; diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 52f59a190e..44b54df434 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -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(); diff --git a/tools/src/mindustry/tools/FontGenerator.java b/tools/src/mindustry/tools/FontGenerator.java index ff13b8fd53..1c1ef50013 100644 --- a/tools/src/mindustry/tools/FontGenerator.java +++ b/tools/src/mindustry/tools/FontGenerator.java @@ -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{