diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java index 36021e6..6a57528 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptHobbit.java @@ -1,5 +1,6 @@ package com.zivilon.cinder_loe.entity.corrupt; +import com.zivilon.cinder_loe.CinderLoE_Config; import lotr.common.LOTRAchievement; import lotr.common.LOTRFoods; import lotr.common.LOTRMod; @@ -58,7 +59,7 @@ public class CorruptHobbit extends LOTREntityHobbitBounder { } @Override public LOTRFaction getFaction() { - return this.faction != null ? this.faction : LOTRFaction.UTUMNO; + return LOTRFaction.valueOf(CinderLoE_Config.corrupt_faction); } @Override protected float getSoundPitch() { diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java index 0a46069..ab2d75b 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptMan.java @@ -21,6 +21,8 @@ public class CorruptMan extends LOTREntityGondorMan { public CorruptMan(World world) { super(world); + ((EntityLiving) this).tasks.addTask(6, (EntityAIBase) new LOTREntityAIEat(this, LOTRFoods.ORC, 8000)); + ((EntityLiving) this).tasks.addTask(6, (EntityAIBase) new LOTREntityAIDrink(this, LOTRFoods.ORC_DRINK, 8000)); this.addTargetTasks(true); } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java index 94777c3..79d2b9c 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java @@ -1,6 +1,7 @@ package com.zivilon.cinder_loe.entity.corrupt; import com.zivilon.cinder_loe.CinderLoE_Config; +import lotr.common.LOTRLevelData; import lotr.common.entity.ai.LOTREntityAIAttackOnCollide; import lotr.common.entity.npc.LOTREntityGondorMan; import lotr.common.entity.npc.LOTRNames; @@ -41,7 +42,12 @@ public class CorruptSkeleton extends CorruptMan { @Override public LOTRFaction getFaction() { - return LOTRFaction.UTUMNO; + if (hiredNPCInfo.getHiringPlayer() != null) { + if (LOTRLevelData.getData(hiredNPCInfo.getHiringPlayer()).getPledgeFaction() != null) { + return LOTRFaction.valueOf(String.valueOf(LOTRLevelData.getData(hiredNPCInfo.getHiringPlayer()).getPledgeFaction())); + } + } + return LOTRFaction.valueOf(CinderLoE_Config.corrupt_faction); } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java index 58ef61e..a6b7fe5 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java @@ -57,12 +57,6 @@ public class CorruptSkeletonArcher extends CorruptSkeleton { } } - - @Override - public LOTRFaction getFaction() { - return LOTRFaction.UTUMNO; - } - @Override public String getNPCName() { return this.familyInfo.getName(); diff --git a/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_0.png b/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_0.png index e427528..373ac6a 100644 Binary files a/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_0.png and b/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_0.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_90.png b/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_90.png index b6c0bfe..4f4fddd 100644 Binary files a/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_90.png and b/src/main/resources/assets/lotr/textures/blocks/ivory_block_side_90.png differ diff --git a/src/main/resources/assets/lotr/textures/blocks/ivory_block_top.png b/src/main/resources/assets/lotr/textures/blocks/ivory_block_top.png index 74ac7de..72e33ce 100644 Binary files a/src/main/resources/assets/lotr/textures/blocks/ivory_block_top.png and b/src/main/resources/assets/lotr/textures/blocks/ivory_block_top.png differ