diff --git a/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java b/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java index e7dd5b1..d5b2f37 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java @@ -177,7 +177,7 @@ public class CinderEventHandler implements IFuelHandler { if (item == null || item.getItem() != CinderLoE.bowLurtz) return; event.setCanceled(true); if (entity.isPotionActive(Potion.poison.id)) entity.removePotionEffect(Potion.poison.id); - entity.addPotionEffect(new PotionEffect(LOTRPoisonedDrinks.killingPoison.id, 5)); + entity.addPotionEffect(new PotionEffect(LOTRPoisonedDrinks.killingPoison.id, 100)); } //Elven Arrow, deals more damage to orc kind diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index e141a1a..f1f0d35 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -259,6 +259,11 @@ public class CinderLoE { // public static Item bowserpent; //public static Item swordUsurper; + // Great swords, idk where else to put them + public static Item greatswordAngmar; + public static Item greatswordLindon; + public static Item greatswordDale; + public static Item greatswordNumenor; // Red Dwarves public static Item redDwarfSteel; @@ -540,10 +545,8 @@ public class CinderLoE { // verticalWeaponRack = new VerticalWeaponRack(); // GameRegistry.registerTileEntity(LOTRTileEntityWeaponRack.class, "verticalWeaponRack"); // GameRegistry.registerBlock(verticalWeaponRack, "verticalWeaponRack"); + //Decor - ///rustedsword = (new RustedSword()); - ///GameRegistry.registerBlock(rustedsword, "rustedsword"); - // Barrel fishBarrel = (new FishBarrel()); GameRegistry.registerBlock(fishBarrel, "fishbarrel"); @@ -645,16 +648,7 @@ public class CinderLoE { spawnEgg = new CinderLoESpawnEgg(); - // Wizard Staves - radagastStaff = (new RadagastStaff()).setUnlocalizedName("lotr:radagastStaff").setTextureName("lotr:radagastStaff"); - pallandoStaff = (new PallandoStaff()).setUnlocalizedName("lotr:pallandoStaff").setTextureName("lotr:pallandoStaff"); - alatarStaff = (new AlatarStaff()).setUnlocalizedName("lotr:alatarStaff").setTextureName("lotr:alatarStaff"); - sarumanStaff = (new SarumanStaff()).setUnlocalizedName("lotr:sarumanStaff").setTextureName("lotr:sarumanStaff"); - sarumanWhiteStaff = (new SarumanWhiteStaff()).setUnlocalizedName("lotr:sarumanWhiteStaff").setTextureName("lotr:sarumanStaff"); - // Relics - welfRelic = (new WoodElfRelic()).setUnlocalizedName("lotr:welfRelic").setTextureName("lotr:welfRelic"); - ulukai = (new Ulukai()).setUnlocalizedName("lotr:ulukai").setTextureName("lotr:ulukai"); - unitLevelTool = (new unitLevelTool()).setUnlocalizedName("lotr:unitLevelTool").setTextureName("stick"); + /** * Item Registation @@ -737,13 +731,39 @@ public class CinderLoE { linkLOTRWeapon(sarumanStaff, "sarumanStaff"); linkLOTRWeapon(sarumanWhiteStaff, "sarumanWhiteStaff"); - //Relics + // Wizard Staves + radagastStaff = (new RadagastStaff()).setUnlocalizedName("lotr:radagastStaff").setTextureName("lotr:radagastStaff"); + pallandoStaff = (new PallandoStaff()).setUnlocalizedName("lotr:pallandoStaff").setTextureName("lotr:pallandoStaff"); + alatarStaff = (new AlatarStaff()).setUnlocalizedName("lotr:alatarStaff").setTextureName("lotr:alatarStaff"); + sarumanStaff = (new SarumanStaff()).setUnlocalizedName("lotr:sarumanStaff").setTextureName("lotr:sarumanStaff"); + sarumanWhiteStaff = (new SarumanWhiteStaff()).setUnlocalizedName("lotr:sarumanWhiteStaff").setTextureName("lotr:sarumanStaff"); + // Relics + welfRelic = (new WoodElfRelic()).setUnlocalizedName("lotr:welfRelic").setTextureName("lotr:welfRelic"); + ulukai = (new Ulukai()).setUnlocalizedName("lotr:ulukai").setTextureName("lotr:ulukai"); ItemRegistration.register(welfRelic, "welfRelic", 6704); ItemRegistration.register(ulukai, "ulukai", 6706); linkLOTRWeapon(welfRelic, "welfRelic"); + unitLevelTool = (new unitLevelTool()).setUnlocalizedName("lotr:unitLevelTool").setTextureName("stick"); + + // Great Swords + greatswordAngmar = (new LoEGreatSword(LOTRMaterial.ANGMAR)).setUnlocalizedName("lotr:greatswordAngmar").setTextureName("lotr:greatswordAngmar"); + greatswordLindon = (new LoEGreatSword(LOTRMaterial.HIGH_ELVEN).setIsElvenBlade()).setUnlocalizedName("lotr:greatswordLindon").setTextureName("lotr:greatswordLindon"); + greatswordDale = (new LoEGreatSword(LOTRMaterial.DALE)).setUnlocalizedName("lotr:greatswordDale").setTextureName("lotr:greatswordDale"); + greatswordNumenor = (new LoEGreatSword(LOTRMaterial.BLACK_NUMENOREAN)).setUnlocalizedName("lotr:greatswordNumenor").setTextureName("lotr:greatswordNumenor"); + + ItemRegistration.register(greatswordAngmar,"greatswordAngmar",6707); + ItemRegistration.register(greatswordLindon,"greatswordLindon",6708); + ItemRegistration.register(greatswordDale,"greatswordDale",6709); + ItemRegistration.register(greatswordNumenor,"greatswordNumenor",6710); + + linkLOTRWeapon(greatswordAngmar, "greatswordAngmar"); + linkLOTRWeapon(greatswordLindon, "greatswordLindon"); + linkLOTRWeapon(greatswordDale, "greatswordDale"); + linkLOTRWeapon(greatswordNumenor, "greatswordNumenor"); // Misc + MATERIAL_JADE = getLOTRMaterialByName("JADE"); cinderFurItem = (new CinderFurItem()).setUnlocalizedName("cinder_fur_item").setTextureName("lotr:cinder_fur_item_0"); ItemRegistration.register(cinderFurItem,"cinderFurItem",6004); @@ -800,7 +820,6 @@ public class CinderLoE { ItemRegistration.register(cleaver,"cleaver",6109); - ItemRegistration.register(warDart,"warDart",6111); ItemRegistration.register(warDartHeads,"warDartHeads",6500); diff --git a/src/main/java/com/zivilon/cinder_loe/entity/npc/evil_human/UmbarUsurper.java b/src/main/java/com/zivilon/cinder_loe/entity/npc/evil_human/UmbarUsurper.java index fe31917..5e557c5 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/npc/evil_human/UmbarUsurper.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/npc/evil_human/UmbarUsurper.java @@ -58,7 +58,7 @@ public class UmbarUsurper extends LOTREntityUmbarWarrior { @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(30.0); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(26.0); this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.2); } } diff --git a/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java b/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java new file mode 100644 index 0000000..5ffa369 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/items/LoEGreatSword.java @@ -0,0 +1,42 @@ +package com.zivilon.cinder_loe.items; + +import com.zivilon.cinder_loe.LoECreativeTabs; +import lotr.common.item.LOTRItemSword; +import lotr.common.item.LOTRMaterial; +import lotr.common.item.LOTRWeaponStats; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class LoEGreatSword extends LOTRItemSword { + public Item repair_item; + + public LoEGreatSword(LOTRMaterial material) { + this(material, (Item) null); + } + public LoEGreatSword(LOTRMaterial material, Block repair_block) { + this(material, Item.getItemFromBlock(repair_block)); + } + public LoEGreatSword(LOTRMaterial material, Item item) { + super(material); + repair_item = item; + setCreativeTab(LoECreativeTabs.tabCombatLoE); + } + + public LoEGreatSword setWeaponDamage(float damage) { + this.lotrWeaponDamage = damage; + return this; + } + + @Override + public boolean getIsRepairable(ItemStack item, ItemStack repair_material) { + if (repair_material.getItem() == repair_item) + return true; + return false; + } + + static { + LOTRWeaponStats.registerMeleeSpeed(LoEGreatSword.class, 0.833f); + LOTRWeaponStats.registerMeleeReach(LoEGreatSword.class, 1.25f); + } +} diff --git a/src/main/resources/assets/lotr/armor/artifact_dorlomin.png b/src/main/resources/assets/lotr/armor/artifact_dorlomin.png index c9b82f5..9b23fce 100644 Binary files a/src/main/resources/assets/lotr/armor/artifact_dorlomin.png and b/src/main/resources/assets/lotr/armor/artifact_dorlomin.png differ diff --git a/src/main/resources/assets/lotr/textures/items/greatswordDale.png b/src/main/resources/assets/lotr/textures/items/greatswordDale.png new file mode 100644 index 0000000..cf4072e Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/greatswordDale.png differ diff --git a/src/main/resources/assets/lotr/textures/items/greatswordLindon.png b/src/main/resources/assets/lotr/textures/items/greatswordLindon.png new file mode 100644 index 0000000..dbeae56 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/greatswordLindon.png differ diff --git a/src/main/resources/assets/lotr/textures/items/greatswordLindon_glowing.png b/src/main/resources/assets/lotr/textures/items/greatswordLindon_glowing.png new file mode 100644 index 0000000..20beab0 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/greatswordLindon_glowing.png differ diff --git a/src/main/resources/assets/lotr/textures/items/greatswordNumenor.png b/src/main/resources/assets/lotr/textures/items/greatswordNumenor.png new file mode 100644 index 0000000..c1294d9 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/greatswordNumenor.png differ diff --git a/src/main/resources/assets/lotr/textures/items/helmetDorLomin.png b/src/main/resources/assets/lotr/textures/items/helmetDorLomin.png new file mode 100644 index 0000000..64ab29c Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/helmetDorLomin.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large2/greatswordDale.png b/src/main/resources/assets/lotr/textures/items/large2/greatswordDale.png new file mode 100644 index 0000000..735907d Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large2/greatswordDale.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large2/greatswordLindon.png b/src/main/resources/assets/lotr/textures/items/large2/greatswordLindon.png new file mode 100644 index 0000000..559e335 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large2/greatswordLindon.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large2/greatswordLindon_glowing.png b/src/main/resources/assets/lotr/textures/items/large2/greatswordLindon_glowing.png new file mode 100644 index 0000000..cc0c38c Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large2/greatswordLindon_glowing.png differ diff --git a/src/main/resources/assets/lotr/textures/items/large2/greatswordNumenor.png b/src/main/resources/assets/lotr/textures/items/large2/greatswordNumenor.png new file mode 100644 index 0000000..6e95b95 Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/large2/greatswordNumenor.png differ