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

Merging changes from private branch

Browse Source
This commit is contained in:
Anuken
2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/src/mindustry/game/MapObjectives.java
View File

@@ -277,6 +277,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
String className = getClass().getSimpleName().replace("Objective", "");
return Core.bundle == null ? className : Core.bundle.get("objective." + className.toLowerCase() + ".name", className);
}
/** Validate fields after reading to make sure none of them are null. */
public void validate(){
}
}
/** Research a specific piece of content in the tech tree. */
@@ -298,6 +303,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.research", content.emoji(), content.localizedName);
}
@Override
public void validate(){
if(content == null) content = Items.copper;
}
}
/** Produce a specific piece of content in the tech tree (essentially research with different text). */
@@ -319,6 +329,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.produce", content.emoji(), content.localizedName);
}
@Override
public void validate(){
if(content == null) content = Items.copper;
}
}
/** Have a certain amount of item in your core. */
@@ -342,6 +357,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.item", state.rules.defaultTeam.items().get(item), amount, item.emoji(), item.localizedName);
}
@Override
public void validate(){
if(item == null) item = Items.copper;
}
}
/** Get a certain item in your core (through a block, not manually.) */
@@ -365,6 +385,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.coreitem", state.stats.coreItemCount.get(item), amount, item.emoji(), item.localizedName);
}
@Override
public void validate(){
if(item == null) item = Items.copper;
}
}
/** Build a certain amount of a block. */
@@ -388,6 +413,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.build", count - state.stats.placedBlockCount.get(block, 0), block.emoji(), block.localizedName);
}
@Override
public void validate(){
if(block == null) block = Blocks.conveyor;
}
}
/** Produce a certain amount of a unit. */
@@ -411,6 +441,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.buildunit", count - state.rules.defaultTeam.data().countType(unit), unit.emoji(), unit.localizedName);
}
@Override
public void validate(){
if(unit == null) unit = UnitTypes.dagger;
}
}
/** Produce a certain amount of units. */
@@ -524,6 +559,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.destroyblock", block.emoji(), block.localizedName);
}
@Override
public void validate(){
if(block == null) block = Blocks.router;
}
}
public static class DestroyBlocksObjective extends MapObjective{
@@ -559,6 +599,11 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public String text(){
return Core.bundle.format("objective.destroyblocks", progress(), positions.length, block.emoji(), block.localizedName);
}
@Override
public void validate(){
if(block == null) block = Blocks.router;
}
}
/** Command any unit to do anything. Always compete in headless mode. */