From 80a4e67ddf34c04c7c5e6dc996521f1b0dc2d32f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 10 Oct 2019 16:47:46 -0400
Subject: [PATCH] Better replacement

---
 core/src/io/anuke/mindustry/content/UnitTypes.java | 2 +-
 core/src/io/anuke/mindustry/mod/ContentParser.java | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index f632fcee19..c472d9de93 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -62,7 +62,7 @@ public class UnitTypes implements ContentList{
             range = 70f;
             itemCapacity = 70;
             health = 400;
-            buildPower = 1f;
+            buildPower = 0.4f;
             engineOffset = 6.5f;
             toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium);
             weapon = new Weapon("heal-blaster"){{
diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java
index d3d390f07a..eaeb46b10b 100644
--- a/core/src/io/anuke/mindustry/mod/ContentParser.java
+++ b/core/src/io/anuke/mindustry/mod/ContentParser.java
@@ -195,9 +195,9 @@ public class ContentParser{
             T item;
             if(Vars.content.getByName(type, name) != null){
                 item = (T)Vars.content.getByName(type, name);
+                readBundle(type, name, value);
             }else{
                 readBundle(type, name, value);
-
                 item = constructor.get(mod + "-" + name);
             }
             currentContent = item;
@@ -207,17 +207,22 @@ public class ContentParser{
     }
 
     private void readBundle(ContentType type, String name, JsonValue value){
-        String entryName = type + "." + currentMod.name + "-" + name + ".";
+        UnlockableContent cont = Vars.content.getByName(type, name) instanceof UnlockableContent ?
+                                Vars.content.getByName(type, name) : null;
+
+        String entryName = cont == null ? type + "." + currentMod.name + "-" + name + "." : type + "." + cont.name + ".";
         I18NBundle bundle = Core.bundle;
         while(bundle.getParent() != null) bundle = bundle.getParent();
 
         if(value.has("name")){
             bundle.getProperties().put(entryName + "name", value.getString("name"));
+            if(cont != null) cont.localizedName = value.getString("name");
             value.remove("name");
         }
 
         if(value.has("description")){
             bundle.getProperties().put(entryName + "description", value.getString("description"));
+            if(cont != null) cont.description = value.getString("description");
             value.remove("description");
         }
     }