Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #2622

Browse Source
This commit is contained in:
Anuken
2020-09-19 17:35:32 -04:00
parent eb8658e140
commit cdd1e90d1a
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+1
View File
@@ -342,6 +342,7 @@ public class Blocks implements ContentList{
sandWall = new StaticWall("sand-wall"){{ sandWall = new StaticWall("sand-wall"){{
variants = 2; variants = 2;
sandWater.asFloor().wall = this;
}}; }};
saltWall = new StaticWall("salt-wall"); saltWall = new StaticWall("salt-wall");
core/src/mindustry/content/UnitTypes.java
+3
View File
@@ -38,6 +38,9 @@ public class UnitTypes implements ContentList{
//air + building + mining + payload //air + building + mining + payload
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega; public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega;
//air + building + payload TODO implement
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType quad, oct;
//air + building + mining //air + building + mining
public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma; public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma;
core/src/mindustry/world/Tile.java
-2
View File
@@ -8,7 +8,6 @@ import arc.scene.ui.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import arc.struct.*; import arc.struct.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.game.*; import mindustry.game.*;
@@ -92,7 +91,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{
if(y >= cy + 1) return 3; if(y >= cy + 1) return 3;
} }
}else{ //need offsets here }else{ //need offsets here
Log.info("");
if(Math.abs(x - cx + 0.5f) > Math.abs(y - cy + 0.5f)){ if(Math.abs(x - cx + 0.5f) > Math.abs(y - cy + 0.5f)){
if(x+0.5f <= cx - 1) return 0; if(x+0.5f <= cx - 1) return 0;
if(x+0.5f >= cx + 1) return 2; if(x+0.5f >= cx + 1) return 2;