Buildtool descriptions (#10089)

Reworked building desc in buildtool Added raider highlight when only 15% are left Changed all wordings from colonist to citizen
ldtteam · Sep 15, 2024 · eda970a · eda970a
1 parent ad28aad
commit eda970a
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 86 deletions.
diff --git a/src/main/java/com/minecolonies/api/util/constant/TranslationConstants.java b/src/main/java/com/minecolonies/api/util/constant/TranslationConstants.java
@@ -432,11 +432,11 @@ public final class TranslationConstants
     @NonNls
     public static final String BUILDER_BUILDING_TOO_HIGH                          = "entity.builder.messagebuildtoohigh";
     @NonNls
-    public static final String BUILDER_BUILDING_TOO_LOW                           = "entity.builder.messagebuildtoolow";
+    public static final String BUILDER_BUILDING_TOO_LOW = "entity.builder.messagebuildtoolow";
     @NonNls
-    public static final String COLONIST_DESC                                      = "block.blockhuttownhall.messagecolonistdesc";
+    public static final String CITIZEN_DEATH_DESC       = "block.blockhuttownhall.messagecitizendeathdesc";
     @NonNls
-    public static final String WORKER_DESC                                        = "block.blockhuttownhall.messageworkerdesc";
+    public static final String WORKER_DESC              = "block.blockhuttownhall.messageworkerdesc";
     @NonNls
     public static final String COLONIST_GRAVE_LOCATION                            = "block.blockhuttownhall.messagecolonistgravelocation";
     @NonNls

diff --git a/src/main/java/com/minecolonies/core/colony/events/raid/AbstractShipRaidEvent.java b/src/main/java/com/minecolonies/core/colony/events/raid/AbstractShipRaidEvent.java
@@ -290,7 +290,7 @@ public void onUpdate()
         }
 
         // Mark entities when spies exist
-        if (colony.getRaiderManager().areSpiesEnabled())
+        if (colony.getRaiderManager().areSpiesEnabled() || spawners.isEmpty())
         {
             for (final Entity entity : getEntities())
             {

diff --git a/src/main/java/com/minecolonies/core/colony/events/raid/HordeRaidEvent.java b/src/main/java/com/minecolonies/core/colony/events/raid/HordeRaidEvent.java
@@ -10,13 +10,13 @@
 import com.minecolonies.api.entity.citizen.happiness.StaticHappinessSupplier;
 import com.minecolonies.api.entity.mobs.AbstractEntityRaiderMob;
 import com.minecolonies.api.entity.mobs.RaiderMobUtils;
-import com.minecolonies.core.entity.pathfinding.pathresults.PathResult;
 import com.minecolonies.api.sounds.RaidSounds;
 import com.minecolonies.api.util.*;
 import com.minecolonies.api.util.MessageUtils.MessagePriority;
 import com.minecolonies.api.util.constant.NbtTagConstants;
 import com.minecolonies.core.colony.events.raid.barbarianEvent.Horde;
 import com.minecolonies.core.colony.events.raid.pirateEvent.ShipBasedRaiderUtils;
+import com.minecolonies.core.entity.pathfinding.pathresults.PathResult;
 import com.minecolonies.core.network.messages.client.PlayAudioMessage;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
@@ -474,7 +474,7 @@ public void onUpdate()
                 continue;
             }
 
-            if (colony.getRaiderManager().areSpiesEnabled())
+            if (colony.getRaiderManager().areSpiesEnabled() || horde.numberOfBosses + horde.numberOfRaiders + horde.numberOfArchers < Math.round(horde.initialSize * 0.15))
             {
                 ((LivingEntity) entity).addEffect(new MobEffectInstance(MobEffects.GLOWING, 550));
             }

diff --git a/src/main/java/com/minecolonies/core/entity/citizen/CitizenCombatTracker.java b/src/main/java/com/minecolonies/core/entity/citizen/CitizenCombatTracker.java
@@ -44,7 +44,7 @@ public Component getDeathMessage()
         else
         {
             nameComponent = Component.translatable(
-              TranslationConstants.COLONIST_DESC,
+              TranslationConstants.CITIZEN_DEATH_DESC,
               citizen.getCitizenData().getName());
         }
         //CombatTracker#getDeathMessage