Ore renaming
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 325 B |
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
Before Width: | Height: | Size: 328 B After Width: | Height: | Size: 328 B |
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 322 B After Width: | Height: | Size: 322 B |
After Width: | Height: | Size: 312 B |
After Width: | Height: | Size: 316 B |
After Width: | Height: | Size: 328 B |
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
Before Width: | Height: | Size: 284 B After Width: | Height: | Size: 284 B |
Before Width: | Height: | Size: 291 B After Width: | Height: | Size: 291 B |
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 316 B |
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 317 B |
Before Width: | Height: | Size: 298 B After Width: | Height: | Size: 298 B |
Before Width: | Height: | Size: 277 B After Width: | Height: | Size: 277 B |
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 269 B |
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 370 B |
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 349 B |
Before Width: | Height: | Size: 279 B After Width: | Height: | Size: 279 B |
Before Width: | Height: | Size: 310 B After Width: | Height: | Size: 310 B |
Before Width: | Height: | Size: 275 B After Width: | Height: | Size: 275 B |
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 296 B |
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 346 B |
Before Width: | Height: | Size: 294 B After Width: | Height: | Size: 294 B |
Before Width: | Height: | Size: 296 B After Width: | Height: | Size: 296 B |
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 399 B |
Before Width: | Height: | Size: 327 B After Width: | Height: | Size: 327 B |
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
@ -496,3 +496,6 @@
|
||||
63208=quell-missile|unit-quell-missile-ui
|
||||
63207=bulwark|unit-bulwark-ui
|
||||
63206=mech-assembler|block-mech-assembler-ui
|
||||
63205=ore-crystal-thorium|block-ore-crystal-thorium-ui
|
||||
63204=ore-wall-beryllium|block-ore-wall-beryllium-ui
|
||||
63203=ore-wall-tungsten|block-ore-wall-tungsten-ui
|
||||
|
@ -55,7 +55,7 @@ public class Blocks{
|
||||
|
||||
//ores
|
||||
oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium,
|
||||
oreTungsten,
|
||||
oreTungsten, oreCrystalThorium,
|
||||
|
||||
//wall ores
|
||||
wallOreBeryl, graphiticWall, wallOreTungsten,
|
||||
@ -697,8 +697,7 @@ public class Blocks{
|
||||
|
||||
oreTungsten = new OreBlock(Items.tungsten);
|
||||
|
||||
//endregion
|
||||
//region wall ore
|
||||
oreCrystalThorium = new OreBlock("ore-crystal-thorium", Items.thorium);
|
||||
|
||||
wallOreBeryl = new WallOreBlock(Items.beryllium);
|
||||
|
||||
|
@ -255,7 +255,7 @@ public class SectorDamage{
|
||||
//first, calculate the total health of blocks in the path
|
||||
|
||||
//radius around the path that gets counted
|
||||
int radius = 5;
|
||||
int radius = 6;
|
||||
IntSet counted = new IntSet();
|
||||
|
||||
for(Tile t : sparse2){
|
||||
@ -335,6 +335,7 @@ public class SectorDamage{
|
||||
Seq<Vec2> waveDps = new Seq<>(), waveHealth = new Seq<>();
|
||||
int groundSpawns = Math.max(spawner.countFlyerSpawns(), 1), airSpawns = Math.max(spawner.countGroundSpawns(), 1);
|
||||
|
||||
//TODO storing all this is dumb when you can just calculate it exactly from the rules...
|
||||
for(int wave = state.wave; wave < state.wave + 10; wave ++){
|
||||
float sumWaveDps = 0f, sumWaveHealth = 0f;
|
||||
|
||||
|
@ -44,7 +44,11 @@ public class OreBlock extends OverlayFloor{
|
||||
@OverrideCallSuper
|
||||
public void createIcons(MultiPacker packer){
|
||||
for(int i = 0; i < variants; i++){
|
||||
PixmapRegion shadow = Core.atlas.getPixmap(itemDrop.name + (i + 1));
|
||||
//use name (e.g. "ore-copper1"), fallback to "copper1" as per the old naming system
|
||||
PixmapRegion shadow = Core.atlas.has(name + (i + 1)) ?
|
||||
Core.atlas.getPixmap(name + (i + 1)) :
|
||||
Core.atlas.getPixmap(itemDrop.name + (i + 1));
|
||||
|
||||
Pixmap image = shadow.crop();
|
||||
|
||||
int offset = image.width / tilesize - 1;
|
||||
|
@ -6,7 +6,7 @@ import mindustry.type.*;
|
||||
public class WallOreBlock extends OreBlock{
|
||||
|
||||
public WallOreBlock(Item ore){
|
||||
super("wall-ore-" + ore.name, ore);
|
||||
super("ore-wall-" + ore.name, ore);
|
||||
}
|
||||
|
||||
//mods only
|
||||
|
@ -668,13 +668,12 @@ public class Generators{
|
||||
|
||||
generate("ore-icons", () -> {
|
||||
content.blocks().<OreBlock>each(b -> b instanceof OreBlock, ore -> {
|
||||
String prefix = ore instanceof WallOreBlock ? "wall-ore-" : "ore-";
|
||||
Item item = ore.itemDrop;
|
||||
ore.load();
|
||||
int shadowColor = Color.rgba8888(0, 0, 0, 0.3f);
|
||||
|
||||
for(int i = 0; i < ore.variants; i++){
|
||||
//get base image to draw on
|
||||
Pixmap base = get((ore instanceof WallOreBlock ? "wall-" : "") + item.name + (i + 1));
|
||||
Pixmap base = get(ore.variantRegions[i]);
|
||||
Pixmap image = base.copy();
|
||||
|
||||
int offset = image.width / tilesize - 1;
|
||||
@ -688,9 +687,11 @@ public class Generators{
|
||||
}
|
||||
}
|
||||
|
||||
replace(ore.variantRegions[i], image);
|
||||
|
||||
image.draw(base, true);
|
||||
save(image, "../blocks/environment/" + prefix + item.name + (i + 1));
|
||||
save(image, "../editor/editor-" + prefix + item.name + (i + 1));
|
||||
save(image, "../blocks/environment/" + ore.name + (i + 1));
|
||||
save(image, "../editor/editor-" + ore.name + (i + 1));
|
||||
|
||||
save(image, "block-" + ore.name + "-full");
|
||||
save(image, "../ui/block-" + ore.name + "-ui");
|
||||
|
@ -27,7 +27,7 @@ public class ScriptMainGenerator{
|
||||
public static void main(String[] args) throws Exception{
|
||||
String base = "mindustry";
|
||||
Seq<String> blacklist = Seq.with("plugin", "mod", "net", "io", "tools");
|
||||
Seq<String> nameBlacklist = Seq.with("ClassAccess");
|
||||
Seq<String> nameBlacklist = Seq.with();
|
||||
Seq<Class<?>> whitelist = Seq.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class,
|
||||
AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, Shader.class,
|
||||
Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class,
|
||||
|