Removed Orthanc Armor from Uruk Scavengers

Added Orthanc Armor to Uruk Smiths
Gave Sirrandrai their Battleblade
Gave Esgarothi Soldiers their greatsword
Fixed Orc brewers not holding orc brews in their hand

src/main/java/com/zivilon/cinder_loe/entity/npc/elf/Sirrandrai.java

@@ -45,7 +45,7 @@ public class Sirrandrai extends LOTREntityHighElfWarrior {
         data = super.onSpawnWithEgg(data);
         int i = this.rand.nextInt(2);
         if (i == 0) {
-            this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.polearmHighElven));
+            this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.greatswordLindon));
             if (this.rand.nextInt(5) == 0) {
                 this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon());
                 this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.spearHighElven));

src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/EsgarothSoldier.java

@@ -23,17 +23,16 @@ public class EsgarothSoldier extends LOTREntityDaleSoldier {
     @Override
     public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
         data = super.onSpawnWithEgg(data);
-        int i = this.rand.nextInt(5);
+        int i = this.rand.nextInt(2);
-        if (i == 0 || i == 1 || i == 2) {
+        if (i == 0) {
-            this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.swordDale));
+            this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.greatswordDale));
-        } else if (i == 3) {
+            if (this.rand.nextInt(5) == 0) {
-            this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.battleaxeDale));
+                this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon());
-        } else if (i == 4) {
+                this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.spearDale));
-            this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.pikeDale));
+            }
-        }
+        } else if (i == 1) {
-        if (this.rand.nextInt(6) == 0) {
-            this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon());
             this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.spearDale));
+            this.npcItemsInv.setSpearBackup(null);
         }
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(CinderLoE.bootsEsgaroth));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcBrewer.java

@@ -39,7 +39,7 @@ public class AngmarOrcBrewer extends LOTREntityAngmarOrc implements LOTRTradeabl
     public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
         data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerAngmarPoisoned));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
+        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
         this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsAngmar));
         this.setCurrentItemOrArmor(3, new ItemStack(LOTRMod.bodyFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcBrewer.java

@@ -35,7 +35,7 @@ public class DolGuldurOrcBrewer extends LOTREntityDolGuldurOrc implements LOTRTr
     public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
         data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerDolGuldurPoisoned));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
+        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
         this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsDolGuldur));
         this.setCurrentItemOrArmor(3, new ItemStack(LOTRMod.bodyFur));

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcBrewer.java

@@ -35,9 +35,9 @@ public class GundabadOrcBrewer extends LOTREntityGundabadOrc implements LOTRTrad
     public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
         data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerGundabadUrukPoisoned));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
+        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
-        this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsDolGuldur));
+        this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsBronze));
         this.setCurrentItemOrArmor(3, new ItemStack(LOTRMod.bodyFur));
         this.setCurrentItemOrArmor(4, new ItemStack(LOTRMod.helmetFur));
         return data;

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollBrewer.java

@@ -35,7 +35,7 @@ public class HalfTrollBrewer extends LOTREntityHalfTroll implements LOTRTradeabl
     public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
         data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerHalfTrollPoisoned));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
+        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
                 this.setCurrentItemOrArmor(4, new ItemStack(LOTRMod.helmetHalfTroll));
         return data;
     }

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcBrewer.java

@@ -34,9 +34,9 @@ public class IsengardOrcBrewer extends LOTREntityIsengardSnaga implements LOTRTr
     public IEntityLivingData onSpawnWithEgg(IEntityLivingData data) {
         data = super.onSpawnWithEgg(data);
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerUrukPoisoned));
-        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
+        this.npcItemsInv.setIdleItem(new ItemStack(LOTRMod.mugOrcDraught));
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
-        this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsDolGuldur));
+        this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsUruk));
         this.setCurrentItemOrArmor(3, new ItemStack(LOTRMod.bodyFur));
         this.setCurrentItemOrArmor(4, new ItemStack(LOTRMod.helmetFur));
         return data;

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcSmith.java

@@ -73,6 +73,10 @@ public class IsengardOrcSmith extends LOTREntityUrukHai implements LOTRTradeable
                 new LOTRTradeEntry(new ItemStack(Items.iron_axe), 14),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.pickaxeUruk), 16),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.axeUruk), 16),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.helmetOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.bodyOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.legsOrthancGuard), 100),
+                new LOTRTradeEntry(new ItemStack(CinderLoE.bootsOrthancGuard), 100),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorUruk), 25));
 
         URUK_SMITH_SELL = new LOTRTradeEntries(TradeType.SELL,

src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcBrewer.java

@@ -37,7 +37,7 @@ public class MordorOrcBrewer extends LOTREntityMordorOrc implements LOTRTradeabl
         this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.daggerOrcPoisoned));
         this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
         this.setCurrentItemOrArmor(1, new ItemStack(LOTRMod.bootsFur));
-        this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsAngmar));
+        this.setCurrentItemOrArmor(2, new ItemStack(LOTRMod.legsOrc));
         this.setCurrentItemOrArmor(3, new ItemStack(LOTRMod.bodyFur));
         this.setCurrentItemOrArmor(4, new ItemStack(LOTRMod.helmetFur));
         return data;

src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java

@@ -370,10 +370,6 @@ public abstract class MixinLOTRTradeEntriesOverrides {
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 1), 2),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.cinderFurItem, 1, 0), 2),
                 new LOTRTradeEntry(new ItemStack(LOTRMod.wargArmorUruk), 25),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.helmetOrthancGuard), 100),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.bodyOrthancGuard), 100),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.legsOrthancGuard), 100),
-                new LOTRTradeEntry(new ItemStack(CinderLoE.bootsOrthancGuard), 100),
                 new LOTRTradeEntry(new ItemStack(CinderLoE.spiceIngredient, 1, 1), 500));
         ((MixinLOTRTradeEntriesOverrides)(Object)URUK_HAI_TRADER_BUY).setVessels(LOTRFoods.ORC_DRINK);