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

Fixed 'spark' name conflict

Browse Source
This commit is contained in:
Anuken
2021-11-04 16:20:39 -04:00
parent 0effae1cd7
commit 3a70a26b93
3 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -1728,7 +1728,7 @@ public class Blocks implements ContentList{
coreBastion = new CoreBlock("core-bastion"){{ coreBastion = new CoreBlock("core-bastion"){{
requirements(Category.effect, BuildVisibility.editorOnly, with(Items.beryllium, 1000, Items.graphite, 1000)); requirements(Category.effect, BuildVisibility.editorOnly, with(Items.beryllium, 1000, Items.graphite, 1000));
unitType = UnitTypes.spark; unitType = UnitTypes.evoke;
health = 3000; health = 3000;
itemCapacity = 3000; //TODO more or less? itemCapacity = 3000; //TODO more or less?
size = 3; size = 3;

4
core/src/mindustry/content/UnitTypes.java
View File

@@ -40,7 +40,7 @@ public class UnitTypes implements ContentList{
//air //air
public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra, public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra,
spark; evoke; //elicit, incite?
//air, legacy //air, legacy
public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono; public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono;
@@ -2412,7 +2412,7 @@ public class UnitTypes implements ContentList{
}}; }};
//TODO bad name //TODO bad name
spark = new UnitType("spark"){{ evoke = new UnitType("evoke"){{
defaultController = BuilderAI::new; defaultController = BuilderAI::new;
isCounted = false; isCounted = false;
envDisabled = 0; envDisabled = 0;

27
core/src/mindustry/world/blocks/production/BurstDrill.java
View File

@@ -15,11 +15,10 @@ public class BurstDrill extends Drill{
public @Load("@-top-invert") TextureRegion topInvertRegion; public @Load("@-top-invert") TextureRegion topInvertRegion;
public @Load("@-arrow") TextureRegion arrowRegion; public @Load("@-arrow") TextureRegion arrowRegion;
public @Load("@-arrow-blur") TextureRegion arrowBlurRegion; public @Load("@-arrow-blur") TextureRegion arrowBlurRegion;
public float invertTime = 80f;
public float invertedTime = 190f;
public float arrowSpacing = 4f; public float arrowSpacing = 4f;
public Color arrowColor = Color.valueOf("feb380"); public Color arrowColor = Color.valueOf("feb380"), baseArrowColor = Color.valueOf("6e7080");
//public @Load(value = "impact-reactor-plasma-#", length = 4) TextureRegion[] plasmaRegions;
//public Color plasma1 = Color.valueOf("ffd06b"), plasma2 = Color.valueOf("ff361b");
public BurstDrill(String name){ public BurstDrill(String name){
super(name); super(name);
@@ -48,7 +47,7 @@ public class BurstDrill extends Drill{
return; return;
} }
if(invertTime > 0f) invertTime -= delta() / invertTime; if(invertTime > 0f) invertTime -= delta() / invertedTime;
if(timer(timerDump, dumpTime)){ if(timer(timerDump, dumpTime)){
dump(items.has(dominantItem) ? dominantItem : null); dump(items.has(dominantItem) ? dominantItem : null);
@@ -93,27 +92,12 @@ public class BurstDrill extends Drill{
Draw.rect(region, x, y); Draw.rect(region, x, y);
drawDefaultCracks(); drawDefaultCracks();
//TODO charge
if(dominantItem != null && drawMineItem){ if(dominantItem != null && drawMineItem){
Draw.color(dominantItem.color); Draw.color(dominantItem.color);
Draw.rect(itemRegion, x, y); Draw.rect(itemRegion, x, y);
Draw.color(); Draw.color();
} }
/*
Draw.blend(Blending.additive);
for(int i = 0; i < plasmaRegions.length; i++){
float r = size * tilesize - 3f + Mathf.absin(timeDrilled, 2f + i * 1f, 5f - i * 0.5f);
Draw.color(plasma1, plasma2, (float)i / plasmaRegions.length);
Draw.alpha((0.3f + Mathf.absin(Time.time, 2f + i * 2f, 0.3f + i * 0.05f)) * Interp.pow4In.apply(warmup));
Draw.rect(plasmaRegions[i], x, y, r, r, timeDrilled * 3f * (12 + i * 2f));
}
Draw.blend();
Draw.color();*/
//Drawf.spinSprite(rotatorRegion, x, y, timeDrilled * rotateSpeed);
Draw.rect(topRegion, x, y); Draw.rect(topRegion, x, y);
if(invertTime > 0){ if(invertTime > 0){
Draw.alpha(Interp.pow3Out.apply(invertTime)); Draw.alpha(Interp.pow3Out.apply(invertTime));
@@ -132,8 +116,9 @@ public class BurstDrill extends Drill{
float a = Mathf.clamp(fract * arrows - arrowFract); float a = Mathf.clamp(fract * arrows - arrowFract);
Tmp.v1.trns(i * 90 + 45, j * arrowSpacing); Tmp.v1.trns(i * 90 + 45, j * arrowSpacing);
//TODO maybe just use arrow alpha and that drawn on the base?
Draw.z(z); Draw.z(z);
Draw.color(Color.valueOf("6e7080"), arrowColor, a); Draw.color(baseArrowColor, arrowColor, a);
Draw.rect(arrowRegion, x + Tmp.v1.x, y + Tmp.v1.y, i * 90); Draw.rect(arrowRegion, x + Tmp.v1.x, y + Tmp.v1.y, i * 90);
Draw.color(arrowColor); Draw.color(arrowColor);