Bugfixes
This commit is contained in:
@@ -560,7 +560,7 @@ sector.overgrowth.name = Overgrowth
|
|||||||
sector.tarFields.name = Tar Fields
|
sector.tarFields.name = Tar Fields
|
||||||
sector.saltFlats.name = Salt Flats
|
sector.saltFlats.name = Salt Flats
|
||||||
sector.fungalPass.name = Fungal Pass
|
sector.fungalPass.name = Fungal Pass
|
||||||
sector.biomassResearchFacility.name = Biomass Research Facility
|
sector.biomassFacility.name = Biomass Synthesis Facility
|
||||||
|
|
||||||
#unused
|
#unused
|
||||||
#sector.crags.name = Crags
|
#sector.crags.name = Crags
|
||||||
|
|||||||
BIN
core/assets/maps/biomassFacility.msav
Normal file
BIN
core/assets/maps/biomassFacility.msav
Normal file
Binary file not shown.
Binary file not shown.
@@ -208,16 +208,30 @@ public class BlockIndexer{
|
|||||||
public Seq<Tile> getEnemy(Team team, BlockFlag type){
|
public Seq<Tile> getEnemy(Team team, BlockFlag type){
|
||||||
returnArray.clear();
|
returnArray.clear();
|
||||||
Seq<TeamData> data = state.teams.present;
|
Seq<TeamData> data = state.teams.present;
|
||||||
for(int i = 0; i < data.size; i++){
|
//when team data is not initialized, scan through every team. this is terrible
|
||||||
Team enemy = data.items[i].team;
|
if(data.isEmpty()){
|
||||||
if(enemy == team) continue;
|
for(Team enemy : Team.all){
|
||||||
TileArray set = getFlagged(enemy)[type.ordinal()];
|
if(enemy == team) continue;
|
||||||
if(set != null){
|
TileArray set = getFlagged(enemy)[type.ordinal()];
|
||||||
for(Tile tile : set){
|
if(set != null){
|
||||||
returnArray.add(tile);
|
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;
|
return returnArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -351,13 +351,7 @@ public class Pathfinder implements Runnable{
|
|||||||
threadList.add(path);
|
threadList.add(path);
|
||||||
|
|
||||||
//add to main thread's list of paths
|
//add to main thread's list of paths
|
||||||
Core.app.post(() -> {
|
Core.app.post(() -> mainList.add(path));
|
||||||
mainList.add(path);
|
|
||||||
//TODO
|
|
||||||
//if(fieldMap[team.id] != null){
|
|
||||||
// fieldMap[team.id].put(target, path);
|
|
||||||
//}
|
|
||||||
});
|
|
||||||
|
|
||||||
//fill with impassables by default
|
//fill with impassables by default
|
||||||
for(int x = 0; x < world.width(); x++){
|
for(int x = 0; x < world.width(); x++){
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class SectorPresets implements ContentList{
|
|||||||
difficulty = 2;
|
difficulty = 2;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
biomassFacility = new SectorPreset("biomassResearchFacility", serpulo, 81){{
|
biomassFacility = new SectorPreset("biomassFacility", serpulo, 81){{
|
||||||
captureWave = 20;
|
captureWave = 20;
|
||||||
difficulty = 3;
|
difficulty = 3;
|
||||||
}};
|
}};
|
||||||
|
|||||||
@@ -30,9 +30,7 @@ public class SchematicsDialog extends BaseDialog{
|
|||||||
|
|
||||||
public SchematicsDialog(){
|
public SchematicsDialog(){
|
||||||
super("@schematics");
|
super("@schematics");
|
||||||
Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> {
|
Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> ((Texture)t).setWrap(TextureWrap.repeat);
|
||||||
((Texture)t).setWrap(TextureWrap.repeat);
|
|
||||||
};
|
|
||||||
|
|
||||||
shouldPause = true;
|
shouldPause = true;
|
||||||
addCloseButton();
|
addCloseButton();
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import java.io.*;
|
|||||||
1. take set of pre-defined icons and SVGs
|
1. take set of pre-defined icons and SVGs
|
||||||
2. use Fontello API to get a font with these
|
2. use Fontello API to get a font with these
|
||||||
3. combine fontello font and standard font, get output font
|
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{
|
public class FontGenerator{
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user