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

Fixed #2722

Browse Source
This commit is contained in:
Anuken
2020-09-25 09:50:38 -04:00
parent 7b90f5a97d
commit 292793daf1
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,6 +208,7 @@ public class Blocks implements ContentList{
liquidDrop = Liquids.slag;
isLiquid = true;
cacheLayer = CacheLayer.slag;
attributes.set(Attribute.heat, 0.85f);
}};
stone = new Floor("stone");
@@ -1142,6 +1143,7 @@ public class Blocks implements ContentList{
powerProduction = 1.8f;
generateEffect = Fx.redgeneratespark;
size = 2;
floating = true;
}};
steamGenerator = new BurnerGenerator("steam-generator"){{

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

@@ -935,7 +935,7 @@ public class UnitTypes implements ContentList{
drag = 0.016f;
flying = true;
range = 140f;
hitSize = 18f;
hitSize = 20f;
lowAltitude = true;
armor = 5f;

2
core/src/mindustry/world/blocks/power/ThermalGenerator.java
View File

@@ -22,7 +22,7 @@ public class ThermalGenerator extends PowerGenerator{
public void setStats(){
super.setStats();
stats.add(BlockStat.tiles, attribute);
stats.add(BlockStat.tiles, attribute, floating);
}
@Override

2
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -130,7 +130,7 @@ public class UnitFactory extends UnitBlock{
Seq<UnitType> units = Seq.with(plans).map(u -> u.unit).filter(u -> u.unlockedNow());
if(units.any()){
ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans[currentPlan].unit, unit -> configure(units.indexOf(unit)));
ItemSelection.buildTable(table, units, () -> currentPlan == -1 ? null : plans[currentPlan].unit, unit -> configure(Structs.indexOf(plans, u -> u.unit == unit)));
}else{
table.table(Styles.black3, t -> t.add("@none").color(Color.lightGray));
}

12
core/src/mindustry/world/meta/BlockStats.java
View File

@@ -38,12 +38,20 @@ public class BlockStats{
}
public void add(BlockStat stat, Attribute attr){
add(stat, attr, 1f);
add(stat, attr, false, 1f);
}
public void add(BlockStat stat, Attribute attr, float scale){
add(stat, attr, false, scale);
}
public void add(BlockStat stat, Attribute attr, boolean floating){
add(stat, attr, floating, 1f);
}
public void add(BlockStat stat, Attribute attr, boolean floating, float scale){
for(Block block : Vars.content.blocks()){
if(!block.isFloor() || block.asFloor().attributes.get(attr) == 0) continue;
if(!block.isFloor() || block.asFloor().attributes.get(attr) == 0 || (block.asFloor().isLiquid && !floating)) continue;
add(stat, new FloorEfficiencyValue(block.asFloor(), block.asFloor().attributes.get(attr) * scale));
}
}