Misc bugfixes

This commit is contained in:
Anuken
2021-07-13 10:28:35 -04:00
parent e0d249898e
commit 8041c305ad
6 changed files with 5 additions and 9 deletions
+1
View File
@@ -101,6 +101,7 @@ customgame = Custom Game
newgame = New Game newgame = New Game
none = <none> none = <none>
none.found = [lightgray]<none found> none.found = [lightgray]<none found>
none.inmap = [lightgray]<none in map>
minimap = Minimap minimap = Minimap
position = Position position = Position
close = Close close = Close
-5
View File
@@ -24,10 +24,8 @@ import mindustry.logic.*;
import mindustry.maps.Map; import mindustry.maps.Map;
import mindustry.maps.*; import mindustry.maps.*;
import mindustry.mod.*; import mindustry.mod.*;
import mindustry.net.Net;
import mindustry.net.*; import mindustry.net.*;
import mindustry.service.*; import mindustry.service.*;
import mindustry.world.*;
import java.io.*; import java.io.*;
import java.nio.charset.*; import java.nio.charset.*;
@@ -113,8 +111,6 @@ public class Vars implements Loadable{
public static final float tilePayload = tilesize * tilesize; public static final float tilePayload = tilesize * tilesize;
/** icon sizes for UI */ /** icon sizes for UI */
public static final float iconXLarge = 8*6f, iconLarge = 8*5f, iconMed = 8*4f, iconSmall = 8*3f; public static final float iconXLarge = 8*6f, iconLarge = 8*5f, iconMed = 8*4f, iconSmall = 8*3f;
/** tile used in certain situations, instead of null */
public static Tile emptyTile;
/** for map generator dialog */ /** for map generator dialog */
public static boolean updateEditorOnChange = false; public static boolean updateEditorOnChange = false;
/** all choosable player colors in join/host dialog */ /** all choosable player colors in join/host dialog */
@@ -278,7 +274,6 @@ public class Vars implements Loadable{
schematicDirectory = dataDirectory.child("schematics/"); schematicDirectory = dataDirectory.child("schematics/");
bebuildDirectory = dataDirectory.child("be_builds/"); bebuildDirectory = dataDirectory.child("be_builds/");
emptyMap = new Map(new StringMap()); emptyMap = new Map(new StringMap());
emptyTile = null;
if(tree == null) tree = new FileTree(); if(tree == null) tree = new FileTree();
if(mods == null) mods = new Mods(); if(mods == null) mods = new Mods();
@@ -232,8 +232,8 @@ public class BulletType extends Content implements Cloneable{
} }
if(entity instanceof Unit unit){ if(entity instanceof Unit unit){
Tmp.v3.set(unit).sub(b.x, b.y).nor().scl(knockback * 80f); Tmp.v3.set(unit).sub(b).nor().scl(knockback * 80f);
if(impact) Tmp.v3.setAngle(b.rotation()); if(impact) Tmp.v3.setAngle(b.rotation() + (knockback < 0 ? 180f : 0f));
unit.impulse(Tmp.v3); unit.impulse(Tmp.v3);
unit.apply(status, statusDuration); unit.apply(status, statusDuration);
} }
@@ -106,7 +106,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
/** Sets up all the necessary variables, but does not add this entity anywhere. */ /** Sets up all the necessary variables, but does not add this entity anywhere. */
public Building create(Block block, Team team){ public Building create(Block block, Team team){
this.tile = emptyTile;
this.block = block; this.block = block;
this.team = team; this.team = team;
@@ -2,6 +2,7 @@ package mindustry.entities.comp;
import arc.math.*; import arc.math.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.util.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.async.PhysicsProcess.*; import mindustry.async.PhysicsProcess.*;
import mindustry.gen.*; import mindustry.gen.*;
@@ -143,7 +143,7 @@ public class StatValues{
} }
} }
}else{ }else{
c.add("@none.found"); c.add("@none.inmap");
} }
}else{ }else{
c.add("@stat.showinmap"); c.add("@stat.showinmap");