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

Updated sector submissions / Added x/y to more drawer types

Browse Source
This commit is contained in:
Anuken
2026-03-17 21:20:34 -04:00
parent 98a9bf1e3c
commit 60f2c61346
12 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -304,6 +304,13 @@ project(":core"){
}
}
task depsJar(type: Jar, dependsOn: classes){
archiveClassifier = 'deps'
from files(sourceSets.main.output.classesDirs)
from{ configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) } }
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
task sourcesJar(type: Jar, dependsOn: classes){
archiveClassifier = 'sources'
from sourceSets.main.allSource

BIN
core/assets/maps/serpulo/hidden/225.msav
View File

Binary file not shown.

BIN
core/assets/maps/serpulo/hidden/47.msav
View File

Binary file not shown.

1
core/src/mindustry/graphics/BlockRenderer.java
View File

@@ -550,7 +550,6 @@ public class BlockRenderer{
}
if(drawQuadtreeDebug){
//TODO remove
Draw.z(Layer.overlayUI);
Lines.stroke(1f, Color.green);

4
core/src/mindustry/maps/SectorSubmissions.java
View File

@@ -24,8 +24,8 @@ public class SectorSubmissions{
public static void registerSectors(){
registerSerpuloSector(76, "Tyrant-classZzz", "https://discord.com/channels/391020510269669376/1379926833411391580/1479890094486716499");
registerSerpuloSector(47, "tinport", "https://discord.com/channels/391020510269669376/1379926802591645820/1397649518203371544");
registerSerpuloSector(225, "Summi", "https://discord.com/channels/391020510269669376/1379926925719376152/1399286858482978900");
registerSerpuloSector(47, "tinport", "https://discord.com/channels/391020510269669376/1379926802591645820/1481778410018570274");
registerSerpuloSector(225, "Summi", "https://discord.com/channels/391020510269669376/1379926925719376152/1419026814826709103");
//111 has an alternate submission https://discord.com/channels/391020510269669376/1379926842659569864/1404825715244793938
registerSerpuloSector(111, "gausofid", "https://discord.com/channels/391020510269669376/1379926842659569864/1422257393042985114");
registerSerpuloSector(176, "wpx", "https://discord.com/channels/391020510269669376/1379926887203213353/1390418885081043135");

6
core/src/mindustry/world/draw/DrawCultivator.java
View File

@@ -15,7 +15,7 @@ public class DrawCultivator extends DrawBlock{
public int bubbles = 12, sides = 8;
public float strokeMin = 0.2f, spread = 3f, timeScl = 70f;
public float recurrence = 6f, radius = 3f;
public float recurrence = 6f, radius = 3f, x, y;
public TextureRegion middle;
@@ -27,12 +27,12 @@ public class DrawCultivator extends DrawBlock{
rand.setSeed(build.pos());
for(int i = 0; i < bubbles; i++){
float x = rand.range(spread), y = rand.range(spread);
float rx = rand.range(spread), ry = rand.range(spread);
float life = 1f - ((Time.time / timeScl + rand.random(recurrence)) % recurrence);
if(life > 0){
Lines.stroke(build.warmup() * (life + strokeMin));
Lines.poly(build.x + x, build.y + y, sides, (1f - life) * radius);
Lines.poly(build.x + rx + x, build.y + ry + y, sides, (1f - life) * radius);
}
}

4
core/src/mindustry/world/draw/DrawFade.java
View File

@@ -8,13 +8,13 @@ import mindustry.world.*;
public class DrawFade extends DrawBlock{
public String suffix = "-top";
public float alpha = 0.6f, scale = 3f;
public float alpha = 0.6f, scale = 3f, x, y;
public TextureRegion region;
@Override
public void draw(Building build){
Draw.alpha(Mathf.absin(build.totalProgress(), scale, alpha) * build.warmup());
Draw.rect(region, build.x, build.y);
Draw.rect(region, build.x + x, build.y + y);
Draw.reset();
}

4
core/src/mindustry/world/draw/DrawPistons.java
View File

@@ -9,7 +9,7 @@ import mindustry.gen.*;
import mindustry.world.*;
public class DrawPistons extends DrawBlock{
public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f, horiOffset = 0f, angleOffset = 0f;
public float sinMag = 4f, sinScl = 6f, sinOffset = 50f, sideOffset = 0f, lenOffset = -1f, horiOffset = 0f, angleOffset = 0f, x, y;
public int sides = 4;
public String suffix = "-piston";
public TextureRegion region1, region2, regiont, iconRegion;
@@ -35,7 +35,7 @@ public class DrawPistons extends DrawBlock{
}
Tmp.v1.trns(angle, len, -horiOffset);
Draw.rect(reg, build.x + Tmp.v1.x, build.y + Tmp.v1.y, angle);
Draw.rect(reg, build.x + Tmp.v1.x + x, build.y + Tmp.v1.y + y, angle);
Draw.yscl = 1f;
}

3
core/src/mindustry/world/draw/DrawPlasma.java
View File

@@ -10,6 +10,7 @@ import mindustry.graphics.*;
import mindustry.world.*;
public class DrawPlasma extends DrawFlame{
public float x, y;
public TextureRegion[] regions;
public String suffix = "-plasma-";
public int plasmas = 4;
@@ -39,7 +40,7 @@ public class DrawPlasma extends DrawFlame{
Draw.color(plasma1, plasma2, (float)i / regions.length);
Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * build.warmup());
Draw.rect(regions[i], build.x, build.y, r, r, build.totalProgress() * (12 + i * 6f));
Draw.rect(regions[i], build.x + x, build.y + y, r, r, build.totalProgress() * (12 + i * 6f));
}
Draw.color();
Draw.blend();

8
core/src/mindustry/world/draw/DrawPulseShape.java
View File

@@ -12,7 +12,7 @@ import static mindustry.Vars.*;
public class DrawPulseShape extends DrawBlock{
public Color color = Pal.accent.cpy();
public float stroke = 2f, timeScl = 100f, minStroke = 0.2f;
public float stroke = 2f, timeScl = 100f, minStroke = 0.2f, x, y;
public float radiusScl = 1f;
public float layer = -1f;
public boolean square = true;
@@ -36,13 +36,13 @@ public class DrawPulseShape extends DrawBlock{
Lines.stroke((stroke * f + minStroke) * build.warmup());
if(square){
Lines.square(build.x, build.y, Math.min(1f + (1f - f) * rad, rad));
Lines.square(build.x + x, build.y + y, Math.min(1f + (1f - f) * rad, rad));
}else{
float r = Math.max(0f, Mathf.clamp(2f - f * 2f) * rad - f - 0.2f), w = Mathf.clamp(0.5f - f) * rad * 2f;
Lines.beginLine();
for(int i = 0; i < 4; i++){
Lines.linePoint(build.x + Geometry.d4(i).x * r + Geometry.d4(i).y * w, build.y + Geometry.d4(i).y * r - Geometry.d4(i).x * w);
if(f < 0.5f) Lines.linePoint(build.x + Geometry.d4(i).x * r - Geometry.d4(i).y * w, build.y + Geometry.d4(i).y * r + Geometry.d4(i).x * w);
Lines.linePoint(build.x + x + Geometry.d4(i).x * r + Geometry.d4(i).y * w, build.y + y + Geometry.d4(i).y * r - Geometry.d4(i).x * w);
if(f < 0.5f) Lines.linePoint(build.x + x + Geometry.d4(i).x * r - Geometry.d4(i).y * w, build.y + y + Geometry.d4(i).y * r + Geometry.d4(i).x * w);
}
Lines.endLine(true);
}

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

@@ -10,7 +10,6 @@ import mindustry.world.*;
public class DrawSideRegion extends DrawBlock{
public TextureRegion top1, top2;
@Override
public void draw(Building build){
Draw.rect(build.rotation > 1 ? top2 : top1, build.x, build.y, build.rotdeg());

5
core/src/mindustry/world/draw/DrawWeave.java
View File

@@ -10,6 +10,7 @@ import mindustry.world.*;
public class DrawWeave extends DrawBlock{
public TextureRegion weave;
public float x, y;
@Override
public void draw(Building build){
@@ -19,8 +20,8 @@ public class DrawWeave extends DrawBlock{
Draw.alpha(build.warmup());
Lines.lineAngleCenter(
build.x + Mathf.sin(build.totalProgress(), 6f, Vars.tilesize / 3f * build.block.size),
build.y,
build.x + x + Mathf.sin(build.totalProgress(), 6f, Vars.tilesize / 3f * build.block.size),
build.y + y,
90,
build.block.size * Vars.tilesize / 2f);