Deployment fixes

This commit is contained in:
Anuken
2020-09-15 19:28:38 -04:00
parent 234649bd68
commit a5ce57e56d
11 changed files with 36 additions and 27 deletions

View File

@@ -255,8 +255,8 @@ public class Weathers implements ContentList{
Texture noise;
{
attrs.set(Attribute.spores, 0.5f);
attrs.set(Attribute.light, -0.1f);
attrs.set(Attribute.spores, 1f);
attrs.set(Attribute.light, -0.15f);
status = StatusEffects.sporeSlowed;
statusGround = false;
}

View File

@@ -255,7 +255,13 @@ public class MapView extends Element implements GestureListener{
Draw.color(Color.gray);
image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight);
image.draw();
Draw.color();
Lines.stroke(3f);
Draw.color(Pal.accent);
Lines.line(centerx - sclwidth/2f, centery, centerx + sclwidth/2f, centery);
Lines.line(centerx, centery - sclheight/2f, centerx, centery + sclheight/2f);
Draw.reset();
}
int index = 0;

View File

@@ -10,7 +10,7 @@ import static mindustry.Vars.*;
public class EntityCollisions{
//range for tile collision scanning
private static final int r = 2;
private static final int r = 1;
//move in 1-unit chunks
private static final float seg = 1f;

View File

@@ -61,7 +61,8 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
}
public void hitboxTile(Rect rect){
float size = hitSize * 0.66f;
//tile hitboxes are never bigger than a tile, otherwise units get stuck
float size = Math.min(hitSize * 0.66f, 7.9f);
rect.setCentered(x, y, size, size);
}
}

View File

@@ -76,6 +76,19 @@ public class HudFragment extends Fragment{
t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX();
});
//minimap + position
parent.fill(t -> {
t.visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial && shown);
//minimap
t.add(new Minimap());
t.row();
//position
t.label(() -> player.tileX() + "," + player.tileY())
.visible(() -> Core.settings.getBool("position") && !state.rules.tutorial)
.touchable(Touchable.disabled);
t.top().right();
});
//TODO tear this all down
//menu at top left
parent.fill(cont -> {
@@ -212,18 +225,6 @@ public class HudFragment extends Fragment{
}).top().left();
});
parent.fill(t -> {
t.visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial && shown);
//minimap
t.add(new Minimap());
t.row();
//position
t.label(() -> player.tileX() + "," + player.tileY())
.visible(() -> Core.settings.getBool("position") && !state.rules.tutorial)
.touchable(Touchable.disabled);
t.top().right();
});
//core items
parent.fill(t -> {
t.top().add(coreItems);