Bugfixes
This commit is contained in:
@@ -317,6 +317,7 @@ public class Control implements ApplicationListener, Loadable{
|
|||||||
}else{
|
}else{
|
||||||
net.reset();
|
net.reset();
|
||||||
logic.reset();
|
logic.reset();
|
||||||
|
sector.setSecondsPassed(0);
|
||||||
world.loadSector(sector);
|
world.loadSector(sector);
|
||||||
state.rules.sector = sector;
|
state.rules.sector = sector;
|
||||||
//assign origin when launching
|
//assign origin when launching
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ public class DefaultWaves{
|
|||||||
unitScaling = 1.7f;
|
unitScaling = 1.7f;
|
||||||
spacing = 2;
|
spacing = 2;
|
||||||
max = 4;
|
max = 4;
|
||||||
|
shieldScaling = 15f;
|
||||||
}},
|
}},
|
||||||
|
|
||||||
new SpawnGroup(pulsar){{
|
new SpawnGroup(pulsar){{
|
||||||
@@ -59,7 +60,8 @@ public class DefaultWaves{
|
|||||||
unitScaling = 1;
|
unitScaling = 1;
|
||||||
unitAmount = 4;
|
unitAmount = 4;
|
||||||
spacing = 2;
|
spacing = 2;
|
||||||
shieldScaling = 10f;
|
shieldScaling = 15f;
|
||||||
|
max = 20;
|
||||||
}},
|
}},
|
||||||
|
|
||||||
new SpawnGroup(mace){{
|
new SpawnGroup(mace){{
|
||||||
@@ -215,7 +217,6 @@ public class DefaultWaves{
|
|||||||
spacing = 4;
|
spacing = 4;
|
||||||
shields = 40f;
|
shields = 40f;
|
||||||
shieldScaling = 20f;
|
shieldScaling = 20f;
|
||||||
|
|
||||||
}},
|
}},
|
||||||
|
|
||||||
new SpawnGroup(atrax){{
|
new SpawnGroup(atrax){{
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ public class Shaders{
|
|||||||
public static class LoadShader extends Shader{
|
public static class LoadShader extends Shader{
|
||||||
|
|
||||||
public LoadShader(String frag, String vert){
|
public LoadShader(String frag, String vert){
|
||||||
super(Core.files.internal("shaders/" + vert + ".vert").readString(), Core.files.internal("shaders/" + frag + ".frag").readString());
|
super(Core.files.internal("shaders/" + vert + ".vert"), Core.files.internal("shaders/" + frag + ".frag"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
|||||||
|
|
||||||
@Remote(called = Loc.server, targets = Loc.both, forward = true)
|
@Remote(called = Loc.server, targets = Loc.both, forward = true)
|
||||||
public static void requestItem(Player player, Building tile, Item item, int amount){
|
public static void requestItem(Player player, Building tile, Item item, int amount){
|
||||||
if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange)) return;
|
if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange) || player.dead()) return;
|
||||||
amount = Math.min(player.unit().maxAccepted(item), amount);
|
amount = Math.min(player.unit().maxAccepted(item), amount);
|
||||||
int fa = amount;
|
int fa = amount;
|
||||||
|
|
||||||
@@ -271,7 +271,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
|||||||
|
|
||||||
@Remote(targets = Loc.both, forward = true, called = Loc.server)
|
@Remote(targets = Loc.both, forward = true, called = Loc.server)
|
||||||
public static void transferInventory(Player player, Building tile){
|
public static void transferInventory(Player player, Building tile){
|
||||||
if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null) return;
|
if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null || player.dead()) return;
|
||||||
|
|
||||||
if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) ||
|
if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) ||
|
||||||
!netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> {
|
!netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> {
|
||||||
|
|||||||
Reference in New Issue
Block a user