lurtz bow, esgaroth armor + soldier, dragon helm of dor lomin

src/main/java/com/zivilon/cinder_loe/CinderLoE.java

@@ -221,8 +221,6 @@ public class CinderLoE {
     public static Item bootsJade;
     public static Item helmetDorLomin;
     public static Item bodyIsildur;
-    public static Item legsArtifact;
-    public static Item bootsArtifact;
     public static Item bowLurtz;
 
     // Misc
@@ -751,6 +749,7 @@ public class CinderLoE {
 
         EVENT = getLOTRMaterialByName("EVENT");
         MATERIAL_JADE = getLOTRMaterialByName("JADE");
+        MATERIAL_ARTIFACT = getLOTRMaterialByName("ARTIFACT");
 
         frostblade = (new LOTRItemSword(EVENT)).setUnlocalizedName("lotr:frostblade").setTextureName("lotr:frostblade");
         daggervoid = (new VoidDagger(EVENT)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:daggerVoid").setTextureName("lotr:daggerVoid").setCreativeTab(null);
@@ -763,11 +762,9 @@ public class CinderLoE {
         legsJade = (new LoEArmor(MATERIAL_JADE, 2,"leggings")).setUnlocalizedName("lotr:legsJade").setTextureName("lotr:legsJade").setCreativeTab(null);
         bootsJade = (new LoEArmor(MATERIAL_JADE, 3)).setUnlocalizedName("lotr:bootsJade").setTextureName("lotr:bootsJade").setCreativeTab(null);
 
-        helmetDorLomin = (new LoEArmor(MATERIAL_ARTIFACT, 0, "helmet")).setUnlocalizedName("lotr:helmetDorLomin").setTextureName("lotr:helmetDorLomin").setCreativeTab(null);
+        helmetDorLomin = (new LoEArmor(MATERIAL_ARTIFACT, 0, "dorlomin")).setUnlocalizedName("lotr:helmetDorLomin").setTextureName("lotr:helmetDorLomin").setCreativeTab(null);
         bodyIsildur = (new LoEArmor(MATERIAL_ARTIFACT, 1, "isildur")).setUnlocalizedName("lotr:bodyIsildur").setTextureName("lotr:bodyIsildur").setCreativeTab(null);
-        legsArtifact = (new LoEArmor(MATERIAL_ARTIFACT, 2,"leggings")).setUnlocalizedName("lotr:legsBronze").setTextureName("lotr:legsBronze").setCreativeTab(null);
+        bowLurtz = (new LOTRItemBow(MATERIAL_ARTIFACT, 1.5)).setDrawTime(30).setUnlocalizedName("lotr:bowLurtz").setTextureName("lotr:bowLurtz");
-        bootsArtifact = (new LoEArmor(MATERIAL_ARTIFACT, 3)).setUnlocalizedName("lotr:legsBronze").setTextureName("lotr:legsBronze").setCreativeTab(null);
-
 
         forgingKit = (new ForgingKit());
         fieldRepairKit = new FieldRepairKit().setUnlocalizedName("lotr:field_repair_kit").setTextureName("lotr:field_repair_kit");
@@ -787,9 +784,9 @@ public class CinderLoE {
 
         ItemRegistration.register(helmetDorLomin, "helmetDorLomin", 6209);
         ItemRegistration.register(bodyIsildur, "bodyIsildur", 6210);
-        ItemRegistration.register(legsArtifact, "legsArtifact", 6211);
+        ItemRegistration.register(bowLurtz, "bowLurtz", 6211);
-        ItemRegistration.register(bootsArtifact, "bootsArtifact", 6212);
 
+        linkLOTRWeapon(bowLurtz, "bowLurtz");
         linkLOTRWeapon(frostblade, "frostblade");
         linkLOTRWeapon(daggervoid, "daggerVoid");
         linkLOTRWeapon(spearsolidgold, "spearsolidgold");

src/main/java/com/zivilon/cinder_loe/client/model/ModelEsgarothHelmet.java

@@ -29,15 +29,14 @@ public class ModelEsgarothHelmet extends LOTRModelBiped {
 		Hemlet = new ModelRenderer(this);
 		Hemlet.setRotationPoint(0.0F, 24.0F, 0.0F);
 
-
 		FrontVisor = new ModelRenderer(this);
 		FrontVisor.setRotationPoint(0.0F, 0.0F, 0.0F);
-		FrontVisor.cubeList.add(new ModelBox(FrontVisor, 32, 0, -6.0F, -29.3F, -6.0F, 12, -1, 4, 0.0F));
+		FrontVisor.cubeList.add(new ModelBox(FrontVisor, 32, 6, -6.0F, -29.1F, -6.2F, 12, 1, 4, 0.0F));
-		FrontVisor.cubeList.add(new ModelBox(FrontVisor, 14, 43, 0.0F, -35.0F, -6.0F, 0, 11, 12, 0.0F));
+		FrontVisor.cubeList.add(new ModelBox(FrontVisor, 14, 41, 0.0F, -35.0F, -6.0F, 0, 11, 12, 0.0F));
 
 		bb_main2 = new ModelRenderer(this);
 		bb_main2.setRotationPoint(0.0F, 0.0F, 0.0F);
-		bb_main2.cubeList.add(new ModelBox(bb_main2, 0, 21, -3.5F, -30.4F, -5.5F, 7, -3, 11, 0.0F));
+		bb_main2.cubeList.add(new ModelBox(bb_main2, 0, 17, -3.5F, -33.2F, -5.5F, 7, 4, 11, 0.0F));
 
 		bb_main = new ModelRenderer(this);
 		bb_main.setRotationPoint(0.0F, 0.0F, 0.0F);
@@ -47,7 +46,6 @@ public class ModelEsgarothHelmet extends LOTRModelBiped {
 		plumeee = new ModelRenderer(this);
 		plumeee.setRotationPoint(0.0F, 0.0F, 0.0F);
 
-
 		plume4_r1 = new ModelRenderer(this);
 		plume4_r1.setRotationPoint(0.0F, -35.0F, 0.0F);
 		setRotationAngle(plume4_r1, -0.829F, 1.2217F, -1.309F);
@@ -84,17 +82,18 @@ public class ModelEsgarothHelmet extends LOTRModelBiped {
 		bipedHead.setRotationPoint(0.0F, 0.0F, 0.0F);
 		bipedHead.cubeList.add(new ModelBox(bipedHead, 0, 0, -4.0F, -8.0F, -4.0F, 8, 8, 8, 1.0F));
 
-		this.bipedHead.addChild(Hemlet);
+		Hemlet.addChild(FrontVisor);
-		this.bipedHead.addChild(FrontVisor);
+		Hemlet.addChild(bb_main2);
-		this.bipedHead.addChild(bb_main2);
+		Hemlet.addChild(bb_main);
-		this.bipedHead.addChild(bb_main);
+		Hemlet.addChild(plumeee);
-		this.bipedHead.addChild(plumeee);
+		plumeee.addChild(plume4_r1);
-		this.bipedHead.addChild(plume4_r1);
+		plumeee.addChild(plume3_r1);
-		this.bipedHead.addChild(plume3_r1);
+		plumeee.addChild(plume2_r1);
-		this.bipedHead.addChild(plume2_r1);
+		plumeee.addChild(plume_r1);
-		this.bipedHead.addChild(plume_r1);
+		plumeee.addChild(plume5_r1);
-		this.bipedHead.addChild(plume5_r1);
+		plumeee.addChild(cube_r1);
-		this.bipedHead.addChild(cube_r1);
+
+		this.bipedHead.addChild(this.Hemlet);
 
 		this.bipedHeadwear.cubeList.clear();
 		this.bipedBody.cubeList.clear();

src/main/java/com/zivilon/cinder_loe/coremod/LOTRWeaponLinker.java

@@ -25,7 +25,8 @@ public class LOTRWeaponLinker implements IClassTransformer {
                 "frostblade", "spearsolidgold", "whip", "spearUnnamed", "welfRelic", "daggerVoid",
                 "swordBree",
                 "maceArnor",
-                "daggerAsh","bowAsh","hammerAsh","pikeAsh","battleaxeAsh","swordAsh","spearAsh", "staffAsh", "cleaver");
+                "daggerAsh","bowAsh","hammerAsh","pikeAsh","battleaxeAsh","swordAsh","spearAsh", "staffAsh", "cleaver",
+                "bowLurtz");
         }
         return basicClass;
     }

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

@@ -20,4 +20,30 @@ public class EsgarothSoldier extends LOTREntityDaleSoldier {
         super(world);
         this.npcShield = LOTRShields.ALIGNMENT_ESGAROTH;
     }
+    @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());
+            this.npcItemsInv.setMeleeWeapon(new ItemStack(LOTRMod.spearDale));
+        }
+        this.npcItemsInv.setIdleItem(this.npcItemsInv.getMeleeWeapon());
+        this.setCurrentItemOrArmor(1, new ItemStack(CinderLoE.bootsEsgaroth));
+        this.setCurrentItemOrArmor(2, new ItemStack(CinderLoE.legsEsgaroth));
+        this.setCurrentItemOrArmor(3, new ItemStack(CinderLoE.bodyEsgaroth));
+        if (this.rand.nextInt(10) != 0) {
+            this.setCurrentItemOrArmor(4, new ItemStack(CinderLoE.helmetEsgaroth));
+        } else {
+            this.setCurrentItemOrArmor(4, null);
+        }
+        return data;
+    }
 }