Correct halberd stat display

MEEPofFaith · Nov 2, 2024 · 1760423 · 1760423
1 parent f6288dc
commit 1760423
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/progressed/entities/bullet/energy/BeamBulletType.java b/src/progressed/entities/bullet/energy/BeamBulletType.java
@@ -25,13 +25,12 @@ public BeamBulletType(float damage, String beamSprite){
         super();
         this.damage = damage;
         this.beamSprite = beamSprite;
-    }
 
-    {
         lifetime = 32f;
         optimalLifeFract = 0.5f;
         laserAbsorb = false; //Apparently laser and pierce aren't applied at the same time.
         pierceCap = 4;
+        ammoMultiplier = 1;
     }
 
     @Override

diff --git a/src/progressed/world/blocks/defence/turret/payload/modular/modules/BeamModule.java b/src/progressed/world/blocks/defence/turret/payload/modular/modules/BeamModule.java
@@ -60,7 +60,12 @@ public void setStats(){
         super.setStats();
 
         stats.remove(Stat.ammo);
-        stats.add(Stat.ammo, PMStatValues.ammo(ObjectMap.of(this, shootType)));
+        //TODO looks bad
+        stats.add(Stat.ammo, table -> {
+            table.row();
+            StatValues.number(liquidConsumed * 60f, StatUnit.perSecond, true).display(table);
+        });
+        stats.add(Stat.ammo, PMStatValues.ammo(ammoTypes));
     }
 
     @Override