More affixes

5 files changed, 153 insertions, 12 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java b/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java
index 701b00f..993a9bd 100644
--- a/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java
+++ b/src/main/java/darkknight/jewelrycraft/affixes/AffixMods.java
@@ -56,21 +56,53 @@ public class AffixMods {
 		ModifierEffect hitheal2 = new FlatLifeHitAffix(2);
 		ModifierEffect hitheal3 = new FlatLifeHitAffix(3);
 
+		ModifierEffect flatDMG1 = new DamageAffix(1, 0, 1);
+		ModifierEffect flatDMG2 = new DamageAffix(2, 0, 1);
+		ModifierEffect flatDMG3 = new DamageAffix(3, 0, 1);
+		ModifierEffect flatDMG4 = new DamageAffix(4, 0, 1);
+		ModifierEffect flatDMG5 = new DamageAffix(5, 0, 1);
+		ModifierEffect flatDMG6 = new DamageAffix(6, 0, 1);
+		
+		ModifierEffect flatarm1 = new ArmorAffix(1, 0, 1);
+		ModifierEffect flatarm2 = new ArmorAffix(2, 0, 1);
+		ModifierEffect flatarm3 = new ArmorAffix(3, 0, 1);
+		ModifierEffect flatarm4 = new ArmorAffix(4, 0, 1);
+		ModifierEffect flatarm5 = new ArmorAffix(5, 0, 1);
+		ModifierEffect flatarm6 = new ArmorAffix(6, 0, 1);
+		
 		prefixes.put("health1", health1);
 		prefixes.put("health2", health2);
 		prefixes.put("health3", health3);
 		prefixes.put("health4", health4);
 		prefixes.put("health5", health5);
 		prefixes.put("health6", health6);
+		
+		prefixes.put("flatdmg1", flatDMG1);
+		prefixes.put("flatdmg2", flatDMG2);
+		prefixes.put("flatdmg3", flatDMG3);
+		prefixes.put("flatdmg4", flatDMG4);
+		prefixes.put("flatdmg5", flatDMG5);
+		prefixes.put("flatdmg6", flatDMG6);
 
 		suffixes.put("health1", health1);
 		suffixes.put("health2", health2);
 		suffixes.put("health3", health3);
+		
 		suffixes.put("hitheal1", hitheal1);
 		suffixes.put("hitheal2", hitheal2);
 		suffixes.put("hitheal3", hitheal3);
-
-		WeightedRandomAffix wraHealth1 = new WeightedRandomAffix("health1", 10);
+		
+		suffixes.put("flatarm1", flatarm1);
+		suffixes.put("flatarm2", flatarm2);
+		suffixes.put("flatarm3", flatarm3);
+		suffixes.put("flatarm4", flatarm4);
+		suffixes.put("flatarm5", flatarm5);
+		suffixes.put("flatarm6", flatarm6);
+
+		/*
+		 * Affix generation
+		 */
+		WeightedRandomAffix wraHealth1 = new WeightedRandomAffix("health1", 9);
 		WeightedRandomAffix wraHealth2 = new WeightedRandomAffix("health2", 8);
 		WeightedRandomAffix wraHealth3 = new WeightedRandomAffix("health3", 6);
 		WeightedRandomAffix wraHealth4 = new WeightedRandomAffix("health4", 4);
@@ -81,6 +113,23 @@ public class AffixMods {
 		WeightedRandomAffix wraHitheal2 = new WeightedRandomAffix("hitheal2", 8);
 		WeightedRandomAffix wraHitheal3 = new WeightedRandomAffix("hitheal3", 7);
 
+		WeightedRandomAffix wraflatDMG1 = new WeightedRandomAffix("flatdmg1", 9);
+		WeightedRandomAffix wraflatDMG2 = new WeightedRandomAffix("flatdmg2", 8);
+		WeightedRandomAffix wraflatDMG3 = new WeightedRandomAffix("flatdmg3", 6);
+		WeightedRandomAffix wraflatDMG4 = new WeightedRandomAffix("flatdmg4", 4);
+		WeightedRandomAffix wraflatDMG5 = new WeightedRandomAffix("flatdmg5", 2);
+		WeightedRandomAffix wraflatDMG6 = new WeightedRandomAffix("flatdmg6", 1);
+		
+		WeightedRandomAffix wraflatarm1 = new WeightedRandomAffix("flatarm1", 9);
+		WeightedRandomAffix wraflatarm2 = new WeightedRandomAffix("flatarm2", 8);
+		WeightedRandomAffix wraflatarm3 = new WeightedRandomAffix("flatarm3", 6);
+		WeightedRandomAffix wraflatarm4 = new WeightedRandomAffix("flatarm4", 4);
+		WeightedRandomAffix wraflatarm5 = new WeightedRandomAffix("flatarm5", 2);
+		WeightedRandomAffix wraflatarm6 = new WeightedRandomAffix("flatarm6", 1);
+		
+		/*
+		 * Prefixes
+		 */
 		generalPrefixGen.add(wraHealth1);
 		generalPrefixGen.add(wraHealth2);
 		generalPrefixGen.add(wraHealth3);
@@ -93,6 +142,21 @@ public class AffixMods {
 		earringsPrefixGen.add(wraHealth5);
 		earringsPrefixGen.add(wraHealth6);
 
+		generalPrefixGen.add(wraflatDMG1);
+		generalPrefixGen.add(wraflatDMG2);
+		ringPrefixGen.add(wraflatDMG1);
+		braceletPrefixGen.add(wraflatDMG2);
+		braceletPrefixGen.add(wraflatDMG3);
+		necklacePrefixGen.add(wraflatDMG3);
+		necklacePrefixGen.add(wraflatDMG4);
+		necklacePrefixGen.add(wraflatDMG5);
+		earringsPrefixGen.add(wraflatDMG5);
+		earringsPrefixGen.add(wraflatDMG6);
+		
+		/*
+		 * Suffixes
+		 */
+		
 		generalSuffixGen.add(wraHealth1);
 		generalSuffixGen.add(wraHealth2);
 		generalSuffixGen.add(wraHealth3);
@@ -106,6 +170,19 @@ public class AffixMods {
 		braceletSuffixGen.add(wraHitheal2);
 		necklaceSuffixGen.add(wraHitheal2);
 		necklaceSuffixGen.add(wraHitheal3);
+		
+		generalSuffixGen.add(wraflatarm1);
+		generalSuffixGen.add(wraflatarm2);
+		generalSuffixGen.add(wraflatarm3);
+		ringSuffixGen.add(wraflatarm1);
+		ringSuffixGen.add(wraflatarm2);
+		braceletSuffixGen.add(wraflatarm2);
+		braceletSuffixGen.add(wraflatarm3);
+		braceletSuffixGen.add(wraflatarm4);
+		necklaceSuffixGen.add(wraflatarm4);
+		necklaceSuffixGen.add(wraflatarm5);
+		earringsSuffixGen.add(wraflatarm5);
+		earringsSuffixGen.add(wraflatarm6);
 	}
 
 	public static ModifierEffect getPrefix(String prefix) {
diff --git a/src/main/java/darkknight/jewelrycraft/affixes/ArmorAffix.java b/src/main/java/darkknight/jewelrycraft/affixes/ArmorAffix.java
new file mode 100644
index 0000000..d0f12af
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/affixes/ArmorAffix.java
@@ -0,0 +1,33 @@
+package darkknight.jewelrycraft.affixes;
+
+import darkknight.jewelrycraft.api.ModifierEffect;
+import darkknight.jewelrycraft.item.ItemBaseJewelry;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.living.LivingHurtEvent;
+
+public class ArmorAffix extends ModifierEffect {
+	private int befAmount;
+	private int aftAmount;
+	
+	private float mult;
+	
+	public ArmorAffix(int befAmount, int aftAmount, float mult) {
+		super(null);
+		
+		this.befAmount = befAmount;
+		this.aftAmount = aftAmount;
+		this.mult = mult;
+	}
+	
+	@Override
+	public void onPlayerHurt(ItemStack item, EntityPlayer player, LivingHurtEvent event, ItemBaseJewelry jewelry) {
+		float amt = event.ammount;
+		
+		amt -= befAmount;
+		amt *= mult;
+		amt -= aftAmount;
+		
+		event.ammount = Math.max(0.5f, amt);
+	}
+}
diff --git a/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java b/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java
index cbfc4ef..e70d5cc 100644
--- a/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java
+++ b/src/main/java/darkknight/jewelrycraft/affixes/DamageAffix.java
@@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 
 public class DamageAffix extends ModifierEffect {
-	private float befFlat;
-	private float affFlat;
+	private int befFlat;
+	private int affFlat;
 
 	private float mult;
 
-	public DamageAffix(float befFlat, float affFlat, float mult) {
+	public DamageAffix(int befFlat, int affFlat, float mult) {
 		super(null);
 
 		this.befFlat = befFlat;
diff --git a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java
index 9b4930f..d223252 100755
--- a/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java
+++ b/src/main/java/darkknight/jewelrycraft/tileentity/TileEntityShadowEye.java
@@ -191,25 +191,26 @@ public class TileEntityShadowEye extends TileEntity {
 		if (worldObj.getBlock(xCoord, yCoord + 2, zCoord) == Blocks.enchanting_table) {

 			if (worldObj.rand.nextBoolean()) {

 				JewelryNBT.addPrefix(centerItem, AffixMods.pickPrefix(worldObj.rand, jewelType));

-				target.addChatMessage(

-						new ChatComponentText(EnumChatFormatting.DARK_PURPLE + "The item is infused with a prefix"));

+				if (target != null)

+					target.addChatMessage(new ChatComponentText(

+							EnumChatFormatting.DARK_PURPLE + "The item is infused with a prefix"));

 			} else if (target.experienceLevel > 2) {

 				target.addExperienceLevel(-2);

 				JewelryNBT.addPrefix(centerItem, AffixMods.pickPrefix(worldObj.rand, jewelType));

-				if (!worldObj.isRemote)

+				if (target != null)

 					target.addChatMessage(new ChatComponentText(

 							EnumChatFormatting.DARK_PURPLE + "You infuse the item with a prefix"));

 			}

 

 			if (worldObj.rand.nextBoolean()) {

 				JewelryNBT.addSuffix(centerItem, AffixMods.pickSuffix(worldObj.rand, jewelType));

-				if (!worldObj.isRemote)

+				if (target != null)

 					target.addChatMessage(new ChatComponentText(

 							EnumChatFormatting.DARK_PURPLE + "The item is infused with a suffix"));

 			} else if (target.experienceLevel > 2) {

 				target.addExperienceLevel(-2);

 				JewelryNBT.addSuffix(centerItem, AffixMods.pickSuffix(worldObj.rand, jewelType));

-				if (!worldObj.isRemote)

+				if (target != null)

 					target.addChatMessage(new ChatComponentText(

 							EnumChatFormatting.DARK_PURPLE + "You infuse the item with a suffix"));

 			}

diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
index 47ee386..6419803 100755
--- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
+++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
@@ -204,6 +204,13 @@ prefix.jewelrycraft2.health4=Stalwart
 prefix.jewelrycraft2.health5=Stout

 prefix.jewelrycraft2.health6=Robust

 

+prefix.jewelrycraft2.flatdmg1=Glinting

+prefix.jewelrycraft2.flatdmg2=Burnished

+prefix.jewelrycraft2.flatdmg3=Polished

+prefix.jewelrycraft2.flatdmg4=Honed

+prefix.jewelrycraft2.flatdmg5=Gleaming

+prefix.jewelrycraft2.flatdmg6=Annealed

+

 prefix.jewelrycraft2.health1.desc=+1 Health

 prefix.jewelrycraft2.health2.desc=+2 Health

 prefix.jewelrycraft2.health3.desc=+3 Health

@@ -211,16 +218,39 @@ prefix.jewelrycraft2.health4.desc=+4 Health
 prefix.jewelrycraft2.health5.desc=+5 Health

 prefix.jewelrycraft2.health6.desc=+6 Health

 

+prefix.jewelrycraft2.flatdmg1.desc=+1 Damage

+prefix.jewelrycraft2.flatdmg2.desc=+2 Damage

+prefix.jewelrycraft2.flatdmg3.desc=+3 Damage

+prefix.jewelrycraft2.flatdmg4.desc=+4 Damage

+prefix.jewelrycraft2.flatdmg5.desc=+5 Damage

+prefix.jewelrycraft2.flatdmg6.desc=+6 Damage

+

 suffix.jewelrycraft2.health1=of the Jackal

 suffix.jewelrycraft2.health2=of the Fox

 suffix.jewelrycraft2.health3=of the Wolf

-suffix.jewelrycraft2.hitheal1=of Rejuvination

+

+suffix.jewelrycraft2.hitheal1=of Rejuvenation

 suffix.jewelrycraft2.hitheal2=of Restoration

 suffix.jewelrycraft2.hitheal3=of Regrowth

 

+suffix.jewelrycraft2.flatarm1=of Health

+suffix.jewelrycraft2.flatarm2=of Protection

+suffix.jewelrycraft2.flatarm3=of Absorption

+suffix.jewelrycraft2.flatarm4=of Life

+suffix.jewelrycraft2.flatarm5=of Amicae

+suffix.jewelrycraft2.flatarm6=of Sanctuary

+

 suffix.jewelrycraft2.health1.desc=+1 Health

 suffix.jewelrycraft2.health2.desc=+2 Health

 suffix.jewelrycraft2.health3.desc=+3 Health

+

 suffix.jewelrycraft2.hitheal1.desc=+1 Health on striking an enemy

 suffix.jewelrycraft2.hitheal2.desc=+2 Health on striking an enemy

-suffix.jewelrycraft2.hitheal3.desc=+3 Health on striking an enemy
\ No newline at end of file
+suffix.jewelrycraft2.hitheal3.desc=+3 Health on striking an enemy

+

+suffix.jewelrycraft2.flatarm1.desc=-1 Damage Taken

+suffix.jewelrycraft2.flatarm2.desc=-2 Damage Taken

+suffix.jewelrycraft2.flatarm3.desc=-3 Damage Taken

+suffix.jewelrycraft2.flatarm4.desc=-4 Damage Taken

+suffix.jewelrycraft2.flatarm5.desc=-5 Damage Taken

+suffix.jewelrycraft2.flatarm6.desc=-6 Damage Taken
\ No newline at end of file