Added default ore flags for modded ores
This commit is contained in:
@@ -398,12 +398,37 @@ public class Blocks implements ContentList{
|
||||
//endregion
|
||||
//region ore
|
||||
|
||||
oreCopper = new OreBlock(Items.copper);
|
||||
oreLead = new OreBlock(Items.lead);
|
||||
oreCopper = new OreBlock(Items.copper){{
|
||||
oreDefault = true;
|
||||
oreThreshold = 0.81f;
|
||||
oreScale = 23.47619f;
|
||||
}};
|
||||
|
||||
oreLead = new OreBlock(Items.lead){{
|
||||
oreDefault = true;
|
||||
oreThreshold = 0.828f;
|
||||
oreScale = 23.952381f;
|
||||
}};
|
||||
|
||||
oreScrap = new OreBlock(Items.scrap);
|
||||
oreCoal = new OreBlock(Items.coal);
|
||||
oreTitanium = new OreBlock(Items.titanium);
|
||||
oreThorium = new OreBlock(Items.thorium);
|
||||
|
||||
oreCoal = new OreBlock(Items.coal){{
|
||||
oreDefault = true;
|
||||
oreThreshold = 0.846f;
|
||||
oreScale = 24.428572f;
|
||||
}};
|
||||
|
||||
oreTitanium = new OreBlock(Items.titanium){{
|
||||
oreDefault = true;
|
||||
oreThreshold = 0.864f;
|
||||
oreScale = 24.904762f;
|
||||
}};
|
||||
|
||||
oreThorium = new OreBlock(Items.thorium){{
|
||||
oreDefault = true;
|
||||
oreThreshold = 0.882f;
|
||||
oreScale = 25.380953f;
|
||||
}};
|
||||
|
||||
//endregion
|
||||
//region crafting
|
||||
|
||||
@@ -338,11 +338,11 @@ public class Maps{
|
||||
}
|
||||
|
||||
public void addDefaultOres(Array<GenerateFilter> filters){
|
||||
int index = 0;
|
||||
for(Block block : new Block[]{Blocks.oreCopper, Blocks.oreLead, Blocks.oreCoal, Blocks.oreTitanium, Blocks.oreThorium}){
|
||||
Array<Block> ores = content.blocks().select(b -> b.isOverlay() && b.asFloor().oreDefault);
|
||||
for(Block block : ores){
|
||||
OreFilter filter = new OreFilter();
|
||||
filter.threshold += index ++ * 0.018f;
|
||||
filter.scl += index/2.1f;
|
||||
filter.threshold = block.asFloor().oreThreshold;
|
||||
filter.scl = block.asFloor().oreScale;
|
||||
filter.ore = block;
|
||||
filters.add(filter);
|
||||
}
|
||||
|
||||
@@ -52,6 +52,10 @@ public class Floor extends Block{
|
||||
public Effect updateEffect = Fx.none;
|
||||
/** Array of affinities to certain things. */
|
||||
public Attributes attributes = new Attributes();
|
||||
/** Whether this ore generates in maps by default. */
|
||||
public boolean oreDefault = false;
|
||||
/** Ore generation params. */
|
||||
public float oreScale = 24f, oreThreshold = 0.828f;
|
||||
|
||||
protected TextureRegion[][] edges;
|
||||
protected byte eq = 0;
|
||||
|
||||
Reference in New Issue
Block a user