Cleanup
This commit is contained in:
@@ -375,10 +375,9 @@ public class Bullets implements ContentList{
|
||||
}};
|
||||
|
||||
//this is just a copy of the damage lightning bullet that doesn't damage air units
|
||||
damageLightningGround = new BulletType(0.0001f, 0f){{
|
||||
collidesAir = false;
|
||||
}};
|
||||
damageLightningGround = new BulletType(0.0001f, 0f){};
|
||||
JsonIO.copy(damageLightning, damageLightningGround);
|
||||
damageLightningGround.collidesAir = false;
|
||||
|
||||
healBullet = new HealBulletType(5.2f, 13){{
|
||||
healPercent = 3f;
|
||||
|
||||
@@ -138,12 +138,13 @@ public class Fx{
|
||||
stroke(3f * e.fout());
|
||||
color(e.color, Color.white, e.fin());
|
||||
|
||||
beginLine();
|
||||
lines.each(Lines::linePoint);
|
||||
linePoint(e.x, e.y);
|
||||
endLine();
|
||||
for(int i = 0; i < lines.size - 1; i++){
|
||||
Vec2 cur = lines.get(i);
|
||||
Vec2 next = lines.get(i + 1);
|
||||
|
||||
Lines.line(cur.x, cur.y, next.x, next.y, false);
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
for(Vec2 p : lines){
|
||||
Fill.circle(p.x, p.y, Lines.getStroke() / 2f);
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ public interface Autotiler{
|
||||
* The mode to slice a texture at.
|
||||
*/
|
||||
enum SliceMode{
|
||||
noSlice,
|
||||
none,
|
||||
bottom,
|
||||
top
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public interface Autotiler{
|
||||
* @return The sliced texture
|
||||
*/
|
||||
default TextureRegion sliced(TextureRegion input, SliceMode mode){
|
||||
return mode == SliceMode.noSlice ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input);
|
||||
return mode == SliceMode.none ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -95,7 +95,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
|
||||
Draw.z(Layer.block);
|
||||
|
||||
Draw.scl(xscl, yscl);
|
||||
drawAt(x, y, blendbits, rotation, SliceMode.noSlice);
|
||||
drawAt(x, y, blendbits, rotation, SliceMode.none);
|
||||
Draw.reset();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user