2
0
Fork 0

Ivory Block rework, Skeletons no longer eat bread

main
KeyLime17 7 months ago
parent f758ef7c31
commit 81e7df1701

@ -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() {

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

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

@ -57,12 +57,6 @@ public class CorruptSkeletonArcher extends CorruptSkeleton {
}
}
@Override
public LOTRFaction getFaction() {
return LOTRFaction.UTUMNO;
}
@Override
public String getNPCName() {
return this.familyInfo.getName();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 654 B

Loading…
Cancel
Save