shinare
/
CinderLoE
2
0
Fork 0
Code

Removed Orthanc Armor from Uruk Scavengers

Browse Source 
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
main
KeyLime17 4 months ago
parent 25defcd21f
commit 8ec2f261b3
10 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/zivilon/cinder_loe/entity/npc/elf/Sirrandrai.java
Unescape Escape View File

@ -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));

17
src/main/java/com/zivilon/cinder_loe/entity/npc/good_human/EsgarothSoldier.java
Unescape Escape View File

@ -23,18 +23,17 @@ 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) {
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));
this.setCurrentItemOrArmor(2, new ItemStack(CinderLoE.legsEsgaroth));

2
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/AngmarOrcBrewer.java
Unescape Escape View File

@ -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));

2
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/DolGuldurOrcBrewer.java
Unescape Escape View File

@ -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));

4
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/GundabadOrcBrewer.java
Unescape Escape View File

@ -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;

2
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/HalfTrollBrewer.java
Unescape Escape View File

@ -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;
}

4
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcBrewer.java
Unescape Escape View File

@ -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;

4
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/IsengardOrcSmith.java
Unescape Escape View File

@ -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,

2
src/main/java/com/zivilon/cinder_loe/entity/npc/orc/trader/MordorOrcBrewer.java
Unescape Escape View File

@ -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;

4
src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRTradeEntriesOverrides.java
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save