Skip to content

Commit 1760423

Browse files
committed
Correct halberd stat display
1 parent f6288dc commit 1760423

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/progressed/entities/bullet/energy/BeamBulletType.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ public BeamBulletType(float damage, String beamSprite){
2525
super();
2626
this.damage = damage;
2727
this.beamSprite = beamSprite;
28-
}
2928

30-
{
3129
lifetime = 32f;
3230
optimalLifeFract = 0.5f;
3331
laserAbsorb = false; //Apparently laser and pierce aren't applied at the same time.
3432
pierceCap = 4;
33+
ammoMultiplier = 1;
3534
}
3635

3736
@Override

src/progressed/world/blocks/defence/turret/payload/modular/modules/BeamModule.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ public void setStats(){
6060
super.setStats();
6161

6262
stats.remove(Stat.ammo);
63-
stats.add(Stat.ammo, PMStatValues.ammo(ObjectMap.of(this, shootType)));
63+
//TODO looks bad
64+
stats.add(Stat.ammo, table -> {
65+
table.row();
66+
StatValues.number(liquidConsumed * 60f, StatUnit.perSecond, true).display(table);
67+
});
68+
stats.add(Stat.ammo, PMStatValues.ammo(ammoTypes));
6469
}
6570

6671
@Override

0 commit comments

Comments
 (0)