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

Reconstructor sprites / Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-06-13 16:27:15 -04:00
parent f55fb48ea7
commit b48736e771
35 changed files with 6830 additions and 6735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ public class Blocks implements ContentList{
//units
groundFactory, airFactory, navalFactory,
reconstructorBasis, reconstructorMorphism, reconstructorFunctor, reconstructorPrime,
additiveReconstructor, multiplicativeReconstructor, exponentialReconstructor, tetrativeReconstructor,
repairPoint,
//campaign
@@ -1685,7 +1685,7 @@ public class Blocks implements ContentList{
consumes.power(1.2f);
}};
reconstructorBasis = new Reconstructor("reconstructor-basis"){{
additiveReconstructor = new Reconstructor("additive-reconstructor"){{
requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
size = 3;
@@ -1702,7 +1702,7 @@ public class Blocks implements ContentList{
};
}};
reconstructorMorphism = new Reconstructor("reconstructor-morphism"){{
multiplicativeReconstructor = new Reconstructor("multiplicative-reconstructor"){{
requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
size = 5;
@@ -1717,8 +1717,7 @@ public class Blocks implements ContentList{
};
}};
//TODO finish these
reconstructorFunctor = new Reconstructor("reconstructor-functor"){{
exponentialReconstructor = new Reconstructor("exponential-reconstructor"){{
requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
size = 7;
@@ -1732,7 +1731,7 @@ public class Blocks implements ContentList{
};
}};
reconstructorPrime = new Reconstructor("reconstructor-prime"){{
tetrativeReconstructor = new Reconstructor("tetrative-reconstructor"){{
requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
size = 9;

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

@@ -81,8 +81,8 @@ public class Weathers implements ContentList{
Core.camera.bounds(Tmp.r2);
int total = (int)(Tmp.r1.area() / density * state.intensity());
Lines.stroke(0.75f);
Draw.color(Color.royal, Color.white, 0.3f);
float alpha = Draw.getColor().a;
Draw.color(Color.royal, Color.white, 0.3f);
for(int i = 0; i < total; i++){
float scl = rand.random(0.5f, 1f);

6
core/src/mindustry/type/Weather.java
View File

@@ -124,12 +124,16 @@ public abstract class Weather extends MappableContent{
if(life < fadeTime){
opacity = life / fadeTime;
}else{
opacity = Mathf.lerpDelta(opacity, 1f, 0.02f);
opacity = Mathf.lerpDelta(opacity, 1f, 0.01f);
}
life -= Time.delta();
weather.update((Weatherc)this);
if(life < 0){
remove();
}
}
@Override

1
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -111,6 +111,7 @@ public class Reconstructor extends UnitBlock{
}
Draw.z(Layer.blockOver + 0.1f);
Drawf.shadow(x, y, size * tilesize, 0.5f);
Draw.rect(topRegion, x, y);
}