From b9aecb16bcf7527f1ec361e2609c571e8039514b Mon Sep 17 00:00:00 2001
From: EmanuelG-Gaming <emanuelgidea2000@gmail.com>
Date: Fri, 3 Jun 2022 17:47:35 +0300
Subject: [PATCH] another commit

---
 assets/bundles/bundle.properties      | 4 +++-
 assets/bundles/bundle_ro.properties   | 4 +++-
 src/erekir/content/ErkTechTree.java   | 3 +++
 src/erekir/content/ErkUnitTypes.java  | 5 +++--
 src/erekir/type/ammo/OreAmmoType.java | 2 --
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
index d81d547..66f1cf9 100644
--- a/assets/bundles/bundle.properties
+++ b/assets/bundles/bundle.properties
@@ -5,4 +5,6 @@ unit.erekir-expansion-gem.details = Contains beryllium traces on its body. Very
 unit.erekir-expansion-geode.name = Geode
 unit.erekir-expansion-geode.description = A unit similar to the previous iteration, except it creates a large field that pushes back enemies and bullets alike.
 unit.erekir-expansion-aggregate.name = Aggregate
-unit.erekir-expansion-aggregate.description = A unit that is similar in attacks to a flare, but fires at a larger distance.
\ No newline at end of file
+unit.erekir-expansion-aggregate.description = A unit that is similar in attacks to a flare, but fires at a larger distance.
+unit.erekir-expansion-agglomerate.name = Agglomerate
+unit.erekir-expansion-agglomerate.description = A unit that can protect its battlefield. Extracts beryllium from walls, and uses it to make missiles.
\ No newline at end of file
diff --git a/assets/bundles/bundle_ro.properties b/assets/bundles/bundle_ro.properties
index 9358e2c..6fbf62d 100644
--- a/assets/bundles/bundle_ro.properties
+++ b/assets/bundles/bundle_ro.properties
@@ -5,4 +5,6 @@ unit.erekir-expansion-gem.details = Conține urme de beriliu pe corp. Foarte scu
 unit.erekir-expansion-geode.name = Geode
 unit.erekir-expansion-geode.description = O unitate similară cu iterația precedentă, dar aceasta creează un mare câmp care împinge inamicii și gloanțele laolaltă.
 unit.erekir-expansion-aggregate.name = Aggregate
-unit.erekir-expansion-aggregate.description = O unitate similară în atacuri cu un flare, dar trage la o distanță mai mare.
\ No newline at end of file
+unit.erekir-expansion-aggregate.description = O unitate similară în atacuri cu un flare, dar trage la o distanță mai mare.
+unit.erekir-expansion-agglomerate.name = Agglomerate
+unit.erekir-expansion-agglomerate.description = O unitate ce își poate consolida câmpul de luptă. Extrage beriliu din ziduri și îl folosește pentru a face rachete.
\ No newline at end of file
diff --git a/src/erekir/content/ErkTechTree.java b/src/erekir/content/ErkTechTree.java
index 0b55783..fd08ee6 100644
--- a/src/erekir/content/ErkTechTree.java
+++ b/src/erekir/content/ErkTechTree.java
@@ -21,6 +21,9 @@ public static void load() {
        customNodeBranch(mechRefabricator, () -> {
            node(ErkUnitTypes.geode);
        });
+       customNodeBranch(shipRefabricator, () -> {
+           node(ErkUnitTypes.agglomerate);
+       });
    }
    
    // Where's the modded branch?!!? 1 -Antumbra
diff --git a/src/erekir/content/ErkUnitTypes.java b/src/erekir/content/ErkUnitTypes.java
index b167888..9dce032 100644
--- a/src/erekir/content/ErkUnitTypes.java
+++ b/src/erekir/content/ErkUnitTypes.java
@@ -228,7 +228,7 @@ public void load() {
            engineSize = 1.75f;
            engineOffset = 2.25f;
            engineLayer = Layer.effect;
-           hitSize = 5;
+           hitSize = 3;
            speed = 3.5f;
            lifetime = 60f * 2.5f;
            outlineColor = Pal.darkOutline;
@@ -266,7 +266,7 @@ public void load() {
           range = 200f;
           engineOffset = 9.5f;
           targetAir = true;
-          ammoType = new OreAmmoType(Blocks.wallOreBeryllium, 25);
+          ammoType = new OreAmmoType(Blocks.wallOreBeryllium, 24);
           
           constructor = UnitEntity::create;
           weapons.add(new Weapon(){{
@@ -282,6 +282,7 @@ public void load() {
                 shake = 1f;
                 speed = 0f;
                 keepVelocity = false;
+                ammoMultiplier = 0.25f;
                 spawnUnit = agglomerateMissile;
              }};
           }});
diff --git a/src/erekir/type/ammo/OreAmmoType.java b/src/erekir/type/ammo/OreAmmoType.java
index 2b77154..e54e008 100644
--- a/src/erekir/type/ammo/OreAmmoType.java
+++ b/src/erekir/type/ammo/OreAmmoType.java
@@ -17,7 +17,6 @@
 public class OreAmmoType implements AmmoType{
     public int range = 5;
     public Block extractOre = Blocks.oreCopper;
-    //public float resupplyTime = 5f;
     public int ammoGain = 1;
     public float totalItems = 20;
 
@@ -52,7 +51,6 @@ public void resupply(Unit unit) {
       
        Tile unitOn = unit.tileOn();
        
-       //TODO won't this lag?
        Geometry.circle(unitOn.x, unitOn.y, (int) offsetRange, (x, y) -> {
           Tile build = world.tile(x, y);
           if (build != null && build.overlay() == extractOre) {