This commit is contained in:
Anuken
2021-07-25 12:04:17 -04:00
parent b6ed5fbd6f
commit c14532ecae
7 changed files with 11 additions and 5 deletions

View File

@@ -215,6 +215,7 @@ hosts.none = [lightgray]No local games found!
host.invalid = [scarlet]Can't connect to host. host.invalid = [scarlet]Can't connect to host.
servers.local = Local Servers servers.local = Local Servers
servers.local.steam = Open Games & Local Servers
servers.remote = Remote Servers servers.remote = Remote Servers
servers.global = Community Servers servers.global = Community Servers

View File

@@ -1628,7 +1628,7 @@ public class Fx{
coalSmeltsmoke = new Effect(40f, e -> { coalSmeltsmoke = new Effect(40f, e -> {
randLenVectors(e.id, 0.2f + e.fin(), 4, 6.3f, (x, y, fin, out) -> { randLenVectors(e.id, 0.2f + e.fin(), 4, 6.3f, (x, y, fin, out) -> {
color(Color.darkGray, Pal.coalBlack, e.finpowdown()); color(Color.darkGray, Pal.coalBlack, e.finpowdown());
Fill.circle(e.x + x, e.y + y, out * 2f + 0.25f); Fill.circle(e.x + x, e.y + y, out * 2f + 0.35f);
}); });
}), }),

View File

@@ -432,6 +432,11 @@ public class Schematics implements Loadable{
if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){ if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){
return; return;
} }
for(var t : seq){
if(t.block() != Blocks.air){
t.remove();
}
}
} }
tile.setBlock(st.block, team, st.rotation); tile.setBlock(st.block, team, st.rotation);

View File

@@ -363,7 +363,7 @@ public abstract class SaveVersion extends SaveFileReader{
int amount = stream.readInt(); int amount = stream.readInt();
for(int j = 0; j < amount; j++){ for(int j = 0; j < amount; j++){
readChunk(stream, true, in -> { readChunk(stream, true, in -> {
byte typeid = in.readByte(); int typeid = in.readUnsignedByte();
if(mapping[typeid] == null){ if(mapping[typeid] == null){
in.skipBytes(lastRegionLength - 1); in.skipBytes(lastRegionLength - 1);
return; return;

View File

@@ -41,7 +41,9 @@ public class UnitType extends UnlockableContent{
/** If true, the unit is always at elevation 1. */ /** If true, the unit is always at elevation 1. */
public boolean flying; public boolean flying;
/** Creates a new instance of this unit class. */
public Prov<? extends Unit> constructor; public Prov<? extends Unit> constructor;
/** The default AI controller to assign on creation. */
public Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI(); public Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI();
/** Environmental flags that are *all* required for this unit to function. 0 = any environment */ /** Environmental flags that are *all* required for this unit to function. 0 = any environment */

View File

@@ -271,7 +271,7 @@ public class JoinDialog extends BaseDialog{
hosts.clear(); hosts.clear();
section("@servers.local", local, false); section(steam ? "@servers.local.steam" : "@servers.local", local, false);
section("@servers.remote", remote, false); section("@servers.remote", remote, false);
section("@servers.global", global, true); section("@servers.global", global, true);

View File

@@ -120,7 +120,6 @@ public class MenuFragment extends Fragment{
table.add(tools); table.add(tools);
table.add(mods); table.add(mods);
//if(platform.canDonate()) table.add(donate);
if(!ios) table.add(exit); if(!ios) table.add(exit);
}).colspan(4); }).colspan(4);
}else{ }else{
@@ -139,7 +138,6 @@ public class MenuFragment extends Fragment{
table.defaults().set(container.defaults()); table.defaults().set(container.defaults());
table.add(mods); table.add(mods);
//if(platform.canDonate()) table.add(donate);
if(!ios) table.add(exit); if(!ios) table.add(exit);
}).colspan(2); }).colspan(2);
} }