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

Removed MetalFloor class

Browse Source
This commit is contained in:
Anuken
2021-06-10 15:39:43 -04:00
parent e3ea1bdaae
commit e4bd3fab7c
3 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,24 +410,20 @@ public class Blocks implements ContentList{
wall = sporeWall; wall = sporeWall;
}}; }};
metalFloor = new MetalFloor("metal-floor"){{ metalFloor = new Floor("metal-floor", 0);
variants = 0; metalFloorDamaged = new Floor("metal-floor-damaged", 3);
attributes.set(Attribute.water, -1f);
}};
metalFloorDamaged = new MetalFloor("metal-floor-damaged", 3); metalFloor2 = new Floor("metal-floor-2", 0);
metalFloor3 = new Floor("metal-floor-3", 0);
metalFloor4 = new Floor("metal-floor-4", 0);
metalFloor5 = new Floor("metal-floor-5", 0);
metalFloor2 = new MetalFloor("metal-floor-2"); darkPanel1 = new Floor("dark-panel-1", 0);
metalFloor3 = new MetalFloor("metal-floor-3"); darkPanel2 = new Floor("dark-panel-2", 0);
metalFloor4 = new MetalFloor("metal-floor-4"); darkPanel3 = new Floor("dark-panel-3", 0);
metalFloor5 = new MetalFloor("metal-floor-5"); darkPanel4 = new Floor("dark-panel-4", 0);
darkPanel5 = new Floor("dark-panel-5", 0);
darkPanel1 = new MetalFloor("dark-panel-1"); darkPanel6 = new Floor("dark-panel-6", 0);
darkPanel2 = new MetalFloor("dark-panel-2");
darkPanel3 = new MetalFloor("dark-panel-3");
darkPanel4 = new MetalFloor("dark-panel-4");
darkPanel5 = new MetalFloor("dark-panel-5");
darkPanel6 = new MetalFloor("dark-panel-6");
darkMetal = new StaticWall("dark-metal"); darkMetal = new StaticWall("dark-metal");

5
core/src/mindustry/world/blocks/environment/Floor.java
View File

@@ -78,6 +78,11 @@ public class Floor extends Block{
super(name); super(name);
} }
public Floor(String name, int variants){
super(name);
this.variants = variants;
}
@Override @Override
public void load(){ public void load(){
super.load(); super.load();

19
core/src/mindustry/world/blocks/environment/MetalFloor.java
View File

@@ -1,19 +0,0 @@
package mindustry.world.blocks.environment;
import mindustry.world.meta.*;
/** Class for quickly defining a floor with no water and no variants. Offers no new functionality. */
public class MetalFloor extends Floor{
public MetalFloor(String name){
super(name);
variants = 0;
attributes.set(Attribute.water, -1);
}
public MetalFloor(String name, int variants){
super(name);
this.variants = variants;
attributes.set(Attribute.water, -1);
}
}