Pathfinder cleanup

This commit is contained in:
Anuken
2022-04-08 22:31:02 -04:00
parent cf45998c3b
commit 21066acc6e
5 changed files with 8 additions and 13 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

+1 -9
View File
@@ -341,7 +341,6 @@
63373=payload-void|block-payload-void-ui 63373=payload-void|block-payload-void-ui
63372=payload-source|block-payload-source-ui 63372=payload-source|block-payload-source-ui
63368=retusa|unit-retusa-ui 63368=retusa|unit-retusa-ui
63367=directional-item-bridge|block-directional-item-bridge-ui
63366=duct-router|block-duct-router-ui 63366=duct-router|block-duct-router-ui
63365=duct-bridge|block-duct-bridge-ui 63365=duct-bridge|block-duct-bridge-ui
63364=oxynoe|unit-oxynoe-ui 63364=oxynoe|unit-oxynoe-ui
@@ -349,7 +348,6 @@
63362=aegires|unit-aegires-ui 63362=aegires|unit-aegires-ui
63361=electrified|status-electrified-ui 63361=electrified|status-electrified-ui
63360=navanax|unit-navanax-ui 63360=navanax|unit-navanax-ui
63354=payload-launch-pad|block-payload-launch-pad-ui
63353=silicon-arc-furnace|block-silicon-arc-furnace-ui 63353=silicon-arc-furnace|block-silicon-arc-furnace-ui
63352=metal-floor-4|block-metal-floor-4-ui 63352=metal-floor-4|block-metal-floor-4-ui
63351=invincible|status-invincible-ui 63351=invincible|status-invincible-ui
@@ -410,7 +408,6 @@
63295=pressure-turbine|block-pressure-turbine-ui 63295=pressure-turbine|block-pressure-turbine-ui
63294=turbine-condenser|block-turbine-condenser-ui 63294=turbine-condenser|block-turbine-condenser-ui
63293=beam-node|block-beam-node-ui 63293=beam-node|block-beam-node-ui
63292=spark|unit-spark-ui
63291=beam-tower|block-beam-tower-ui 63291=beam-tower|block-beam-tower-ui
63290=build-tower|block-build-tower-ui 63290=build-tower|block-build-tower-ui
63289=tungsten|item-tungsten-ui 63289=tungsten|item-tungsten-ui
@@ -426,7 +423,6 @@
63279=reinforced-conduit|block-reinforced-conduit-ui 63279=reinforced-conduit|block-reinforced-conduit-ui
63278=reinforced-liquid-router|block-reinforced-liquid-router-ui 63278=reinforced-liquid-router|block-reinforced-liquid-router-ui
63277=reinforced-liquid-container|block-reinforced-liquid-container-ui 63277=reinforced-liquid-container|block-reinforced-liquid-container-ui
63276=einforced-liquid-tank|block-einforced-liquid-tank-ui
63275=reinforced-liquid-tank|block-reinforced-liquid-tank-ui 63275=reinforced-liquid-tank|block-reinforced-liquid-tank-ui
63274=reinforced-bridge-conduit|block-reinforced-bridge-conduit-ui 63274=reinforced-bridge-conduit|block-reinforced-bridge-conduit-ui
63272=core-citadel|block-core-citadel-ui 63272=core-citadel|block-core-citadel-ui
@@ -447,12 +443,10 @@
63257=emanate|unit-emanate-ui 63257=emanate|unit-emanate-ui
63256=overflow-duct|block-overflow-duct-ui 63256=overflow-duct|block-overflow-duct-ui
63255=large-plasma-bore|block-large-plasma-bore-ui 63255=large-plasma-bore|block-large-plasma-bore-ui
63254=fracture|block-fracture-ui
63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui 63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui
63252=cyanogen|liquid-cyanogen-ui 63252=cyanogen|liquid-cyanogen-ui
63251=gallium|liquid-gallium-ui 63251=gallium|liquid-gallium-ui
63250=slag-centrifuge|block-slag-centrifuge-ui 63250=slag-centrifuge|block-slag-centrifuge-ui
63249=slag-heater|block-slag-heater-ui
63248=slag-incinerator|block-slag-incinerator-ui 63248=slag-incinerator|block-slag-incinerator-ui
63247=phase-synthesizer|block-phase-synthesizer-ui 63247=phase-synthesizer|block-phase-synthesizer-ui
63246=sublimate|block-sublimate-ui 63246=sublimate|block-sublimate-ui
@@ -474,7 +468,6 @@
63230=titan|block-titan-ui 63230=titan|block-titan-ui
63228=small-deconstructor|block-small-deconstructor-ui 63228=small-deconstructor|block-small-deconstructor-ui
63227=barrier-projector|block-barrier-projector-ui 63227=barrier-projector|block-barrier-projector-ui
63226=eletric-heater|block-eletric-heater-ui
63225=vent-condenser|block-vent-condenser-ui 63225=vent-condenser|block-vent-condenser-ui
63224=electric-heater|block-electric-heater-ui 63224=electric-heater|block-electric-heater-ui
63223=phase-heater|block-phase-heater-ui 63223=phase-heater|block-phase-heater-ui
@@ -485,7 +478,6 @@
63218=tungsten-wall-large|block-tungsten-wall-large-ui 63218=tungsten-wall-large|block-tungsten-wall-large-ui
63217=tank-assembler|block-tank-assembler-ui 63217=tank-assembler|block-tank-assembler-ui
63216=assembly-drone|unit-assembly-drone-ui 63216=assembly-drone|unit-assembly-drone-ui
63215=basic-assembler-module|block-basic-assembler-module-ui
63214=beryllium-wall|block-beryllium-wall-ui 63214=beryllium-wall|block-beryllium-wall-ui
63213=beryllium-wall-large|block-beryllium-wall-large-ui 63213=beryllium-wall-large|block-beryllium-wall-large-ui
63212=quell|unit-quell-ui 63212=quell|unit-quell-ui
@@ -539,7 +531,6 @@
63164=world-cell|block-world-cell-ui 63164=world-cell|block-world-cell-ui
63163=carbide-wall|block-carbide-wall-ui 63163=carbide-wall|block-carbide-wall-ui
63162=carbide-wall-large|block-carbide-wall-large-ui 63162=carbide-wall-large|block-carbide-wall-large-ui
63161=prime-control-core|block-prime-control-core-ui
63160=ore-wall-thorium|block-ore-wall-thorium-ui 63160=ore-wall-thorium|block-ore-wall-thorium-ui
63159=core-zone|block-core-zone-ui 63159=core-zone|block-core-zone-ui
63158=fabricator|block-fabricator-ui 63158=fabricator|block-fabricator-ui
@@ -554,3 +545,4 @@
63149=radar|block-radar-ui 63149=radar|block-radar-ui
63148=turret-unit-build-tower|unit-turret-unit-build-tower-ui 63148=turret-unit-build-tower|unit-turret-unit-build-tower-ui
63147=blast-door|block-blast-door-ui 63147=blast-door|block-blast-door-ui
63146=alphaaaa|alphaaaa
+3 -3
View File
@@ -92,7 +92,7 @@ public class Pathfinder implements Runnable{
for(int i = 0; i < tiles.length; i++){ for(int i = 0; i < tiles.length; i++){
Tile tile = world.tiles.geti(i); Tile tile = world.tiles.geti(i);
tiles[i] = packTile(tile, 0); tiles[i] = packTile(tile);
} }
if(state.rules.waveTeam.needsFlowField()){ if(state.rules.waveTeam.needsFlowField()){
@@ -146,7 +146,7 @@ public class Pathfinder implements Runnable{
} }
/** Packs a tile into its internal representation. */ /** Packs a tile into its internal representation. */
public int packTile(Tile tile, int prev){ public int packTile(Tile tile){
boolean nearLiquid = false, nearSolid = false, nearGround = false, solid = tile.solid(), allDeep = tile.floor().isDeep(); boolean nearLiquid = false, nearSolid = false, nearGround = false, solid = tile.solid(), allDeep = tile.floor().isDeep();
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
@@ -216,7 +216,7 @@ public class Pathfinder implements Runnable{
tile.getLinkedTiles(t -> { tile.getLinkedTiles(t -> {
int pos = t.array(); int pos = t.array();
if(pos < tiles.length){ if(pos < tiles.length){
tiles[pos] = packTile(t, tiles[pos]); tiles[pos] = packTile(t);
} }
}); });
+3
View File
@@ -116,7 +116,10 @@ public class Fonts{
TextureRegion region = Core.atlas.find(texture); TextureRegion region = Core.atlas.find(texture);
if(region.texture != uitex){ if(region.texture != uitex){
Log.info("not found: " + nametex[0]);
continue; continue;
}else{
Log.info("found: " + nametex[0]);
} }
unicodeIcons.put(nametex[0], ch); unicodeIcons.put(nametex[0], ch);
+1 -1
View File
@@ -164,7 +164,7 @@ task pack(dependsOn: [classes, configurations.runtimeClasspath]){
//antialias everything except UI elements //antialias everything except UI elements
fileTree(dir: new File(rootDir, 'core/assets-raw/sprites_out/').absolutePath, include: "**/*.png").visit{ file -> fileTree(dir: new File(rootDir, 'core/assets-raw/sprites_out/').absolutePath, include: "**/*.png").visit{ file ->
if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-")) || file.toString().contains(".9.png")) return if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-")) || file.toString().contains(".9.png") || file.toString().contains("alphaaaa")) return
executor.submit{ executor.submit{
antialias(file.file, doAntialias, useFastAA) antialias(file.file, doAntialias, useFastAA)