Misc cleanup

This commit is contained in:
Anuken 2021-02-17 09:15:17 -05:00
parent 080fe8c3c4
commit 00342ddaae
5 changed files with 21 additions and 6 deletions

View file

@ -1541,7 +1541,6 @@ lenum.shoot = Shoot at a position.
lenum.shootp = Shoot at a unit/building with velocity prediction.
lenum.configure = Building configuration, e.g. sorter item.
lenum.enabled = Whether the block is enabled.
lenum.color = Illuminator color.
lenum.always = Always true.
lenum.idiv = Integer division.

View file

@ -209,6 +209,16 @@ public class BaseAI{
}
Tile wtile = world.tile(realX, realY);
if(tile.block instanceof PayloadConveyor || tile.block instanceof PayloadAcceptor){
//near a building
for(Point2 point : Edges.getEdges(tile.block.size)){
var t = world.build(tile.x + point.x, tile.y + point.y);
if(t != null){
return false;
}
}
}
//may intersect AI path
tmpTiles.clear();
if(tile.block.solid && wtile != null && wtile.getLinkedTilesAs(tile.block, tmpTiles).contains(t -> path.contains(t.pos()))){

View file

@ -642,6 +642,7 @@ public class HudFragment extends Fragment{
}
void drawInner(Color color, float fract){
if(fract < 0) return;
if(flip){
x += width;
width = -width;

View file

@ -30,12 +30,17 @@ public class NuclearReactor extends PowerGenerator{
public Color lightColor = Color.valueOf("7f19ea");
public Color coolColor = new Color(1, 1, 1, 0f);
public Color hotColor = Color.valueOf("ff9575a3");
public float itemDuration = 120; //time to consume 1 fuel
public float heating = 0.01f; //heating per frame * fullness
public float smokeThreshold = 0.3f; //threshold at which block starts smoking
/** ticks to consume 1 fuel */
public float itemDuration = 120;
/** heating per frame * fullness */
public float heating = 0.01f;
/** threshold at which block starts smoking */
public float smokeThreshold = 0.3f;
/** heat threshold at which lights start flashing */
public float flashThreshold = 0.46f;
public int explosionRadius = 19;
public int explosionDamage = 1250;
public float flashThreshold = 0.46f; //heat threshold at which the lights start flashing
/** heat removed per unit of coolant */
public float coolantPower = 0.5f;
public @Load("@-top") TextureRegion topRegion;

View file

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=383cca56f16c9cb00c77db681860d6f420f25b53
archash=8a929ec9ae5eb3501f7d3d69848481d49044aad1