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"){{
requirements(Category.effect, BuildVisibility.editorOnly, with(Items.beryllium, 1000, Items.graphite, 1000));
unitType = UnitTypes.spark;
unitType = UnitTypes.evoke;
health = 3000;
itemCapacity = 3000; //TODO more or less?
size = 3;

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

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