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

JSON UnitType type: support

Browse Source
This commit is contained in:
Anuken
2022-05-21 12:40:16 -04:00
parent b010e9d720
commit b8dac1e408
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/entities/part/RegionPart.java
View File

@@ -143,7 +143,6 @@ public class RegionPart extends DrawPart{
String realName = this.name == null ? name + suffix : this.name; String realName = this.name == null ? name + suffix : this.name;
if(drawRegion){ if(drawRegion){
//TODO l/r
if(mirror && turretShading){ if(mirror && turretShading){
regions = new TextureRegion[]{ regions = new TextureRegion[]{
Core.atlas.find(realName + "-r"), Core.atlas.find(realName + "-r"),

4
core/src/mindustry/mod/ContentParser.java
View File

@@ -437,7 +437,9 @@ public class ContentParser{
UnitType unit; UnitType unit;
if(locate(ContentType.unit, name) == null){ if(locate(ContentType.unit, name) == null){
unit = new UnitType(mod + "-" + name);
unit = make(resolve(value.getString("type", ""), UnitType.class), mod + "-" + name);
var typeVal = value.get("type"); var typeVal = value.get("type");
if(typeVal != null && !typeVal.isString()){ if(typeVal != null && !typeVal.isString()){

1
core/src/mindustry/world/draw/DrawFlame.java
View File

@@ -9,7 +9,6 @@ import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.world.*; import mindustry.world.*;
//TODO remake/remove
public class DrawFlame extends DrawBlock{ public class DrawFlame extends DrawBlock{
public Color flameColor = Color.valueOf("ffc999"); public Color flameColor = Color.valueOf("ffc999");
public TextureRegion top; public TextureRegion top;