From 8ec2f261b30b83afe3a0770200ecf8da19c7cd76 Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Sat, 5 Jul 2025 04:15:35 -0400 Subject: [PATCH] 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 --- .../cinder_loe/entity/npc/elf/Sirrandrai.java | 2 +- .../npc/good_human/EsgarothSoldier.java | 19 +++++++++---------- .../npc/orc/trader/AngmarOrcBrewer.java | 2 +- .../npc/orc/trader/DolGuldurOrcBrewer.java | 2 +- .../npc/orc/trader/GundabadOrcBrewer.java | 4 ++-- .../npc/orc/trader/HalfTrollBrewer.java | 2 +- .../npc/orc/trader/IsengardOrcBrewer.java | 4 ++-- .../npc/orc/trader/IsengardOrcSmith.java | 4 ++++ .../npc/orc/trader/MordorOrcBrewer.java | 2 +- .../MixinLOTRTradeEntriesOverrides.java | 4 ---- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/elf/Sirrandrai.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/elf/Sirrandrai.java index 467a10f..e424279 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/elf/Sirrandrai.java +++ b/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)); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/EsgarothSoldier.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/EsgarothSoldier.java index d213f15..551e47d 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/EsgarothSoldier.java +++ b/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); - if (i == 0 || i == 1 || i == 2) { - this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.swordDale)); - } else if (i == 3) { - this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.battleaxeDale)); - } else if (i == 4) { - this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.pikeDale)); - } - if (this.rand.nextInt(6) == 0) { - this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon()); + int i = this.rand.nextInt(2); + if (i == 0) { + this.npcItemsInv.setMeleeWeapon(new ItemStack(CinderLoE.greatswordDale)); + if (this.rand.nextInt(5) == 0) { + this.npcItemsInv.setSpearBackup(this.npcItemsInv.getMeleeWeapon()); + this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.spearDale)); + } + } else if (i == 1) { this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.spearDale)); + this.npcItemsInv.setSpearBackup(null); } this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon()); this.setCurrentItemOrArmor(1, new ItemStack(CinderLoE.bootsEsgaroth)); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcBrewer.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcBrewer.java index 147998e..6303c1c 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcBrewer.java +++ b/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)); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcBrewer.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcBrewer.java index 508cf4f..6d02e55 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcBrewer.java +++ b/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)); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcBrewer.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcBrewer.java index c17c286..b50fc8d 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcBrewer.java +++ b/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; diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollBrewer.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollBrewer.java index 32b7594..26a13fc 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollBrewer.java +++ b/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; } diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcBrewer.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcBrewer.java index 3de0786..f5be7d9 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcBrewer.java +++ b/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; diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcSmith.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcSmith.java index 61dfe9f..e6819dc 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcSmith.java +++ b/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, diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcBrewer.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcBrewer.java index baae80d..03668d0 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcBrewer.java +++ b/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; diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java b/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java index f0523b6..fba1920 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java +++ b/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);