This commit is contained in:
Anuken
2020-08-26 13:56:58 -04:00
parent 0b6ef1c57c
commit fa9deece91
14 changed files with 2160 additions and 2153 deletions

View File

@@ -325,6 +325,10 @@ public class Logic implements ApplicationListener{
Events.fire(Trigger.update);
universe.updateGlobal();
if(Core.settings.modified() && !state.isPlaying()){
Core.settings.forceSave();
}
if(state.isGame()){
if(!net.client()){
state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.type().isCounted);

View File

@@ -696,8 +696,8 @@ public class NetServer implements ApplicationListener{
public static void adminRequest(Player player, Player other, AdminAction action){
if(!player.admin){
Log.warn("ACCESS DENIED: Player @ / @ attempted to perform admin action without proper security access.",
player.name, player.con.address);
Log.warn("ACCESS DENIED: Player @ / @ attempted to perform admin action '@' on '@' without proper security access.",
player.name, player.con.address, action.name(), other == null ? null : other.name);
return;
}

View File

@@ -224,7 +224,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
//apply knockback based on spawns
if(team != state.rules.waveTeam){
float relativeSize = state.rules.dropZoneRadius + bounds()/2f + 1f;
float relativeSize = state.rules.dropZoneRadius + hitSize/2f + 1f;
for(Tile spawn : spawner.getSpawns()){
if(within(spawn.worldx(), spawn.worldy(), relativeSize)){
vel().add(Tmp.v1.set(this).sub(spawn.worldx(), spawn.worldy()).setLength(0.1f + 1f - dst(spawn) / relativeSize).scl(0.45f * Time.delta));

View File

@@ -181,7 +181,7 @@ public class Teams{
/** @return whether this team is controlled by the AI and builds bases. */
public boolean hasAI(){
return state.rules.attackMode && team.rules().ai;
return team.rules().ai;
}
@Override

View File

@@ -127,7 +127,7 @@ public class UnitType extends UnlockableContent{
public void display(Unit unit, Table table){
table.table(t -> {
t.left();
t.add(new Image(icon(Cicon.medium))).size(8 * 4);
t.add(new Image(icon(Cicon.medium))).size(8 * 4).scaling(Scaling.fit);
t.labelWrap(localizedName).left().width(190f).padLeft(5);
}).growX().left();
table.row();

View File

@@ -29,6 +29,7 @@ public class PayloadConveyor extends Block{
rotate = true;
update = true;
outputsPayload = true;
noUpdateDisabled = true;
}
@Override