mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-21 12:08:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Stats for New Blocks (#6913)

Browse Source 
* Stats added

* Fix bug + add WallCrafter speed

* Add more stats

* Update contributors
This commit is contained in:
ErrorInCode 2022-06-08 09:03:37 -04:00 committed by GitHub
parent 77a8cfa894
commit 1b9089aa30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@ -138,3 +138,4 @@ Jerzy Paciorkiewicz
YozoZChomutova
Qendolin
Goobrr
[Error_27]

1
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
View File

@ -80,6 +80,7 @@ public class PayloadMassDriver extends PayloadBlock{
stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared));
stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.seconds);
stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks);
}
@Override

7
core/src/mindustry/world/blocks/power/BeamNode.java
View File

@ -48,6 +48,13 @@ public class BeamNode extends PowerBlock{
addBar("batteries", PowerNode.makeBatteryBalance());
}
@Override
public void setStats(){
super.setStats();
stats.add(Stat.powerRange, range, StatUnit.blocks);
}
@Override
public void init(){
super.init();

6
core/src/mindustry/world/blocks/production/BeamDrill.java
View File

@ -5,9 +5,11 @@ import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.entities.units.*;
import mindustry.game.*;
import mindustry.gen.*;
@ -15,6 +17,7 @@ import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*;
@ -102,6 +105,9 @@ public class BeamDrill extends Block{
public void setStats(){
super.setStats();
stats.add(Stat.drillTier, StatValues.blocks(b -> (b instanceof Floor f && f.wallOre && f.itemDrop != null && f.itemDrop.hardness <= tier) || (b instanceof StaticWall w && w.itemDrop != null && w.itemDrop.hardness <= tier)));
stats.add(Stat.drillSpeed, 60f / drillTime * size, StatUnit.itemsSecond);
if(optionalBoostIntensity != 1){
stats.add(Stat.boostEffect, optionalBoostIntensity, StatUnit.timesSpeed);
}

1
core/src/mindustry/world/blocks/production/WallCrafter.java
View File

@ -64,6 +64,7 @@ public class WallCrafter extends Block{
stats.add(Stat.output, output);
stats.add(Stat.tiles, StatValues.blocks(attribute, floating, 1f, true, false));
stats.add(Stat.drillSpeed, 60f / drillTime * size);
}
@Override

9
core/src/mindustry/world/blocks/units/RepairTower.java
View File

@ -11,6 +11,7 @@ import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.logic.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*;
@ -29,6 +30,14 @@ public class RepairTower extends Block{
solid = true;
}
@Override
public void setStats(){
super.setStats();
stats.add(Stat.range, range, StatUnit.blocks);
stats.add(Stat.repairSpeed, healAmount * 60f, StatUnit.perSecond);
}
@Override
public void drawPlace(int x, int y, int rotation, boolean valid){
super.drawPlace(x, y, rotation, valid);

2
core/src/mindustry/world/meta/StatValues.java
View File

@ -204,7 +204,7 @@ public class StatValues{
for(int i = 0; i < list.size; i++){
var item = list.get(i);
if(item instanceof Block block && block.itemDrop != null && !block.itemDrop.unlocked()) continue;
if(item instanceof Block block && block.itemDrop != null && !block.itemDrop.unlockedNow()) continue;
if(item.uiIcon.found()) l.image(item.uiIcon).size(iconSmall).padRight(2).padLeft(2).padTop(3).padBottom(3);
l.add(item.localizedName).left().padLeft(1).padRight(4).colspan(item.uiIcon.found() ? 1 : 2);